Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0fb67596fa | ||
|
|
eb8af2f02f | ||
|
|
601df1713a | ||
|
|
3749f86ac3 | ||
|
|
9ad1f2653a | ||
|
|
a3e7b8b099 | ||
|
|
484ab1e0b9 | ||
|
|
a9d9cccb04 | ||
|
|
d417cc65bf | ||
|
|
af523e717f | ||
|
|
64837c7206 | ||
|
|
62021e2734 | ||
|
|
d7d6aea9a4 | ||
|
|
f21d94bbcb | ||
|
|
2d98d31943 | ||
|
|
3b358c5be7 | ||
|
|
77390d2a20 |
@@ -28,7 +28,7 @@ hooks:
|
||||
- type: command
|
||||
command: "SH=\"${CLAUDE_SKILL_DIR}/scripts/inject-plan.sh\"; [ -f \"$SH\" ] || SH=$(ls \"$HOME/.claude/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/inject-plan.sh\" 2>/dev/null | head -1); [ -n \"$SH\" ] && [ -f \"$SH\" ] && sh \"$SH\" --context=precompact; exit 0"
|
||||
metadata:
|
||||
version: "3.12.0"
|
||||
version: "3.16.0"
|
||||
---
|
||||
|
||||
# Planning with Files
|
||||
@@ -219,7 +219,7 @@ Helper scripts for automation:
|
||||
|
||||
- `scripts/init-session.sh` — Initialize planning files. With a name arg, creates an isolated plan under `.planning/YYYY-MM-DD-<slug>/` for parallel task workflows. Without args, writes `task_plan.md` at project root (legacy mode, backward-compatible).
|
||||
- `scripts/set-active-plan.sh` — Switch the active plan pointer (`.planning/.active_plan`). Run with a plan ID to switch; run without args to show which plan is current.
|
||||
- `scripts/resolve-plan-dir.sh` — Resolve the active plan directory. Checks `$PLAN_ID` env var first, then `.planning/.active_plan`, then newest plan dir by mtime, then falls back to project root (legacy). Used internally by hooks.
|
||||
- `scripts/resolve-plan-dir.sh` — Resolve the active plan directory. A set `$PLAN_ID` is a binding: it resolves or resolution stops, never another plan (issue #237). With no `$PLAN_ID`, checks `.planning/.active_plan`, then newest plan dir by mtime, then falls back to project root (legacy). Used internally by hooks.
|
||||
- `scripts/check-complete.sh` — Verify all phases in the active plan are complete.
|
||||
- `scripts/session-catchup.py`: Explicit same-project session-record aggregation or bounded replay (`--metadata` / `--replay`); bare invocation does not access host history.
|
||||
- `scripts/attest-plan.sh` (and `.ps1`) — Lock the current `task_plan.md` content with a SHA-256 attestation (v2.37.0). Hooks then refuse to inject plan content if the file diverges from the attested hash. Use `--show` to print the stored hash, `--clear` to remove the attestation. See `/plan-attest` command.
|
||||
@@ -395,8 +395,8 @@ The gate mechanism is host-aware. Not every host can hard-block a stop.
|
||||
| Tier | Hosts | Gate mechanism |
|
||||
|---|---|---|
|
||||
| 1: hard block | Claude Code, Codex CLI, OpenAI Codex API, Continue.dev | `{"decision":"block"}` / exit 2 |
|
||||
| 2: follow-up inject | Cursor, Pi, Kiro | agent_end follow-up message + own counter |
|
||||
| 3: notify only | OpenCode, Gemini CLI, rest | systemMessage only, no enforcement |
|
||||
| 2: follow-up inject | Cursor, Pi, Kiro, Hermes Agent, OpenCode (native plugin) | agent_end follow-up message + own counter; Hermes answers `pre_verify` with a bounded continuation |
|
||||
| 3: notify only | Gemini CLI, rest (OpenCode without the plugin) | systemMessage only, no enforcement |
|
||||
|
||||
Hosts without a blocking Stop hook still get autonomous mode (low recitation + ledger). They do not get gate enforcement; the gate degrades to a notification. This is documented honestly: the gate is real enforcement only on Tier 1.
|
||||
|
||||
|
||||
@@ -32,6 +32,9 @@ param(
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
if (-not $script:IsWindowsHost) {
|
||||
throw "Safe no-follow descriptor operations are unavailable in this PowerShell script on Unix. Use scripts/attest-plan.sh instead."
|
||||
}
|
||||
if ($script:IsWindowsHost -and -not ("PwfAttestationNative" -as [type])) {
|
||||
Add-Type -TypeDefinition @'
|
||||
using System;
|
||||
@@ -382,6 +385,21 @@ function Resolve-ContainedPlanFile {
|
||||
} catch { return $null }
|
||||
}
|
||||
|
||||
function Test-SlugPlanDirectory {
|
||||
param([string] $Directory)
|
||||
try {
|
||||
$finalDirectory = [PwfAttestationNative]::FinalDirectoryPath($Directory)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
$planningDirectory = Split-Path -Parent $finalDirectory
|
||||
$planId = Split-Path -Leaf $finalDirectory
|
||||
return (
|
||||
(Split-Path -Leaf $planningDirectory) -eq ".planning" -and
|
||||
$planId -match '^[A-Za-z0-9_][A-Za-z0-9._-]*$'
|
||||
)
|
||||
}
|
||||
|
||||
function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
@@ -395,10 +413,17 @@ function Resolve-PlanFile {
|
||||
# fall through and attest an unrelated legacy-root plan.
|
||||
if ($env:PWF_PLAN_ROOT -or $env:PLAN_ID) { return $null }
|
||||
$activePointer = Join-Path (Join-Path (Get-Location) ".planning") ".active_plan"
|
||||
if (Test-Path -LiteralPath $activePointer) { return $null }
|
||||
$activePointerItem = Get-Item -LiteralPath $activePointer -Force -ErrorAction SilentlyContinue
|
||||
if ($activePointerItem) { return $null }
|
||||
|
||||
$legacy = Join-Path (Get-Location) "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory (Get-Location).Path)
|
||||
$currentDirectory = (Get-Location).Path
|
||||
if (Test-SlugPlanDirectory $currentDirectory) {
|
||||
$slugPlan = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $slugPlan -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
$legacy = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
function Get-AttestationPath {
|
||||
@@ -406,6 +431,9 @@ function Get-AttestationPath {
|
||||
$planDir = Split-Path -Parent $PlanFile
|
||||
$cwd = (Get-Location).Path
|
||||
if ($planDir -eq $cwd) {
|
||||
if (Test-SlugPlanDirectory $cwd) {
|
||||
return (Join-Path $cwd ".attestation")
|
||||
}
|
||||
return (Join-Path $cwd ".plan-attestation")
|
||||
}
|
||||
return (Join-Path $planDir ".attestation")
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
# 1. $PLAN_ID env var → ./.planning/$PLAN_ID/
|
||||
# 2. ./.planning/.active_plan
|
||||
# 3. Newest ./.planning/<dir>/ by mtime
|
||||
# 4. Legacy ./task_plan.md at project root
|
||||
# 4. Current directory when it is .planning/<valid-slug>/
|
||||
# 5. Legacy ./task_plan.md at project root
|
||||
#
|
||||
# Usage:
|
||||
# sh scripts/attest-plan.sh # attest the active plan
|
||||
@@ -21,6 +22,25 @@ set -u
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
RESOLVER="${SCRIPT_DIR}/resolve-plan-dir.sh"
|
||||
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
resolve_from_slug_cwd() {
|
||||
slug_cwd="$(pwd -P 2>/dev/null)" || return 1
|
||||
planning_dir="${slug_cwd%/*}"
|
||||
[ "${planning_dir##*/}" = ".planning" ] || return 1
|
||||
plan_id="${slug_cwd##*/}"
|
||||
slug_is_valid "${plan_id}" || return 1
|
||||
[ -f "${slug_cwd}/task_plan.md" ] || return 1
|
||||
printf "%s\n" "${slug_cwd}/task_plan.md"
|
||||
}
|
||||
|
||||
resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
@@ -30,6 +50,22 @@ resolve_plan_file() {
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Explicit selectors are bindings, not hints. If the shared resolver
|
||||
# rejected one, do not attest a different plan through a cwd fallback.
|
||||
if [ -n "${PWF_PLAN_ROOT:-}" ] || [ -n "${PLAN_ID:-}" ]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
# An absolute script path does not change the invoking shell's cwd. When
|
||||
# that cwd is a slug plan directory, keep slug-mode storage semantics
|
||||
# instead of misclassifying its task_plan.md as a legacy root plan.
|
||||
slug_plan_file="$(resolve_from_slug_cwd)" || slug_plan_file=""
|
||||
if [ -n "${slug_plan_file}" ]; then
|
||||
printf "%s\n" "${slug_plan_file}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "./task_plan.md" ]; then
|
||||
printf "%s\n" "./task_plan.md"
|
||||
return 0
|
||||
@@ -72,7 +108,18 @@ case "${1:-}" in
|
||||
esac
|
||||
|
||||
plan_file="$(resolve_plan_file)" || {
|
||||
printf "[plan-attest] No task_plan.md found. Create a plan first.\n" >&2
|
||||
# Name the actual cause. "No task_plan.md found" is true but misleading
|
||||
# when the plan exists and an explicit selector was rejected: before #237
|
||||
# a mistyped PLAN_ID attested a DIFFERENT plan at rc=0, and an operator
|
||||
# who now sees a generic not-found is likely to go looking for the wrong
|
||||
# problem. The selectors are bindings, so say which one refused.
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
printf "[plan-attest] PLAN_ID=%s names no plan directory under .planning. An explicit selector is a binding: nothing was attested and no other plan was substituted.\n" "${PLAN_ID}" >&2
|
||||
elif [ -n "${PWF_PLAN_ROOT:-}" ]; then
|
||||
printf "[plan-attest] PWF_PLAN_ROOT=%s did not resolve to a project root holding a plan. An explicit pin is a binding: nothing was attested and no other plan was substituted.\n" "${PWF_PLAN_ROOT}" >&2
|
||||
else
|
||||
printf "[plan-attest] No task_plan.md found. Create a plan first.\n" >&2
|
||||
fi
|
||||
exit 1
|
||||
}
|
||||
|
||||
|
||||
@@ -107,13 +107,27 @@ if (-not $Gate) {
|
||||
|
||||
# ---- Gate path (-Gate). Resolves to advisory unless every guard says block. ----
|
||||
|
||||
# Guard 1: gated mode. The .mode file must contain "gate".
|
||||
# Guard 1: gated mode. A .mode file must contain "gate".
|
||||
#
|
||||
# The project's root .mode is a FLOOR, not a default that slug scope replaces
|
||||
# (issue #238). Reading only <plan-dir>\.mode let a slug plan with no .mode
|
||||
# drop a project-committed gate. "gate" from EITHER file arms the gate; a slug
|
||||
# may raise strictness, never lower it. In root scope $PlanDir already IS the
|
||||
# project root, so the second source is skipped and behavior is unchanged.
|
||||
$modeFile = Join-Path $PlanDir ".mode"
|
||||
$rootForMode = if ($env:PWF_PLAN_ROOT) { $env:PWF_PLAN_ROOT } else { "." }
|
||||
$rootModeFile = $null
|
||||
if ($PlanDir -ne $rootForMode -and $PlanDir -ne ".") {
|
||||
$rootModeFile = Join-Path $rootForMode ".mode"
|
||||
}
|
||||
$gatedMode = $false
|
||||
if (Test-Path $modeFile) {
|
||||
$modeContent = Get-Content $modeFile -Raw -ErrorAction SilentlyContinue
|
||||
foreach ($candidateMode in @($modeFile, $rootModeFile)) {
|
||||
if (-not $candidateMode) { continue }
|
||||
if (-not (Test-Path $candidateMode)) { continue }
|
||||
$modeContent = Get-Content $candidateMode -Raw -ErrorAction SilentlyContinue
|
||||
if ($null -ne $modeContent -and $modeContent -match "gate") {
|
||||
$gatedMode = $true
|
||||
break
|
||||
}
|
||||
}
|
||||
if (-not $gatedMode) {
|
||||
|
||||
@@ -60,6 +60,14 @@ else
|
||||
if [ -n "${RESOLVED_DIR}" ] && [ -f "${RESOLVED_DIR}/task_plan.md" ]; then
|
||||
PLAN_FILE="${RESOLVED_DIR}/task_plan.md"
|
||||
PLAN_DIR="${RESOLVED_DIR}"
|
||||
elif [ -n "${PLAN_ID:-}" ] || [ -n "${PWF_PLAN_ROOT:-}" ]; then
|
||||
# Explicit selectors are bindings, not hints (issue #237). The shared
|
||||
# resolver rejected one, so the legacy cwd fallback below must not run:
|
||||
# answering a mistyped pin with the ROOT plan's completion state is the
|
||||
# same wrong-plan harm the binding removes, and here it would decide
|
||||
# whether an autonomous run is allowed to stop.
|
||||
echo "[planning-with-files] An explicit PLAN_ID or PWF_PLAN_ROOT did not resolve to a plan; no completion state was read and no other plan was substituted."
|
||||
exit 0
|
||||
else
|
||||
PLAN_FILE="task_plan.md"
|
||||
PLAN_DIR="."
|
||||
@@ -131,10 +139,30 @@ fi
|
||||
|
||||
# ---- Gate path (--gate). Resolves to advisory unless every guard says block. ----
|
||||
|
||||
# Guard 1: gated mode. The .mode file must contain "gate". Absent or other
|
||||
# Guard 1: gated mode. A .mode file must contain "gate". Absent or other
|
||||
# content means advisory mode (legacy behavior preserved).
|
||||
#
|
||||
# The project's root .mode is a FLOOR, not a default that slug scope replaces
|
||||
# (issue #238). Reading only <plan-dir>/.mode let a slug plan with no .mode
|
||||
# drop a project-committed gate, the same way it dropped the attestation
|
||||
# requirement in inject-plan.sh. "gate" from EITHER file arms the gate; a slug
|
||||
# may raise strictness, never lower it. In root scope PLAN_DIR already IS the
|
||||
# project root, so the second source stays empty and behavior is unchanged.
|
||||
MODE_FILE="${PLAN_DIR}/.mode"
|
||||
if [ ! -f "${MODE_FILE}" ] || ! grep -q "gate" "${MODE_FILE}" 2>/dev/null; then
|
||||
ROOT_MODE_FILE=""
|
||||
_root_for_mode="${PWF_PLAN_ROOT:-.}"
|
||||
if [ "${PLAN_DIR}" != "${_root_for_mode}" ] && [ "${PLAN_DIR}" != "." ]; then
|
||||
ROOT_MODE_FILE="${_root_for_mode}/.mode"
|
||||
fi
|
||||
GATED=0
|
||||
if [ -f "${MODE_FILE}" ] && grep -q "gate" "${MODE_FILE}" 2>/dev/null; then
|
||||
GATED=1
|
||||
fi
|
||||
if [ "${GATED}" -eq 0 ] && [ -n "${ROOT_MODE_FILE}" ] && [ -f "${ROOT_MODE_FILE}" ] \
|
||||
&& grep -q "gate" "${ROOT_MODE_FILE}" 2>/dev/null; then
|
||||
GATED=1
|
||||
fi
|
||||
if [ "${GATED}" -eq 0 ]; then
|
||||
advisory_report
|
||||
exit 0
|
||||
fi
|
||||
|
||||
@@ -152,6 +152,33 @@ gen_nonce() {
|
||||
# $1 = plan dir (absolute or relative); dotfiles live directly inside it.
|
||||
# $2 = plan file path (task_plan.md) used for auto-attestation resolution.
|
||||
# No-op when MODE is empty (legacy path stays byte-equivalent to v2.43.0).
|
||||
# Raise MODE to the project's committed floor before the side effects run
|
||||
# (issue #238). A project that ships a root .mode has made that setting a
|
||||
# reviewed part of the repo; a new slug plan must not start below it. Without
|
||||
# this, `init-session.sh <name>` created a plan with no .mode at all, and the
|
||||
# project's attestation requirement became a flag the agent chose at plan
|
||||
# creation time.
|
||||
#
|
||||
# inject-plan.sh enforces the same floor at read time, so this is not the
|
||||
# guard. It exists so the effective policy is VISIBLE in the plan directory
|
||||
# rather than only inside the resolver, and so the new plan gets the nonce and
|
||||
# the auto-attestation that autonomous mode needs to inject at all.
|
||||
#
|
||||
# An explicit --autonomous/--gated is never lowered: gated stays gated.
|
||||
inherit_root_mode() {
|
||||
_root_mode="${PWD}/.mode"
|
||||
[ -f "${_root_mode}" ] || return 0
|
||||
[ "$MODE" = "gated" ] && return 0
|
||||
if grep -q 'gate' "${_root_mode}" 2>/dev/null; then
|
||||
MODE='gated'
|
||||
return 0
|
||||
fi
|
||||
if grep -q 'autonomous' "${_root_mode}" 2>/dev/null; then
|
||||
MODE='autonomous'
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
apply_v3_mode() {
|
||||
_mode_dir="$1"
|
||||
_mode_plan="$2"
|
||||
@@ -367,6 +394,7 @@ if [ "$SLUG_MODE" -eq 1 ]; then
|
||||
echo "PLAN_ID=$PLAN_ID"
|
||||
create_files_in "$PLAN_DIR"
|
||||
printf "%s\n" "$PLAN_ID" > "${PLAN_ROOT}/.active_plan"
|
||||
inherit_root_mode
|
||||
apply_v3_mode "$PLAN_DIR" "${PLAN_DIR}/task_plan.md"
|
||||
echo ""
|
||||
echo "Active plan recorded: ${PLAN_ROOT}/.active_plan"
|
||||
|
||||
@@ -27,27 +27,26 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Select a working interpreter, not merely the first executable name on PATH.
|
||||
# Validate candidate interpreters supplied by the selector wrappers below.
|
||||
# Windows Store app aliases can exist as python3.exe while refusing every
|
||||
# script invocation. Probe candidates privately and fail closed if none runs.
|
||||
select_python() {
|
||||
# PWF_TRUSTED_PYTHON is the explicit trust path. PYTHON_BIN remains a
|
||||
# compatibility alias. PATH discovery is a deliberate fallback: the hook
|
||||
# treats the caller's PATH as executable trust, but still requires the
|
||||
# resolved candidate to be an absolute regular executable.
|
||||
for _sp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}" "$(command -v python3 2>/dev/null)" "$(command -v python 2>/dev/null)"; do
|
||||
select_python_candidates() {
|
||||
for _sp_candidate in "$@"; do
|
||||
[ -n "$_sp_candidate" ] || continue
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
case "$_sp_candidate" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
# Git Bash cannot reliably test or invoke C:\... spelling.
|
||||
# Convert before every filesystem predicate and invocation.
|
||||
command -v cygpath >/dev/null 2>&1 || continue
|
||||
_sp_candidate="$(cygpath -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
# Convert with Git Bash's fixed system helper, never PATH.
|
||||
_sp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "$_sp_cygpath" ] && [ -x "$_sp_cygpath" ] || continue
|
||||
_sp_candidate="$("$_sp_cygpath" -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
[ -f "$_sp_candidate" ] || continue
|
||||
[ -x "$_sp_candidate" ] || continue
|
||||
if "$_sp_candidate" -c 'import sys; raise SystemExit(0 if sys.version_info >= (3, 8) else 1)' >/dev/null 2>&1; then
|
||||
@@ -58,6 +57,21 @@ select_python() {
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment may use only an interpreter path the caller explicitly trusted.
|
||||
select_explicit_python() {
|
||||
select_python_candidates "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"
|
||||
}
|
||||
|
||||
# After containment succeeds, PATH discovery remains a compatibility fallback
|
||||
# for hosts that do not export an interpreter path to direct hook invocations.
|
||||
select_python() {
|
||||
select_python_candidates \
|
||||
"${PWF_TRUSTED_PYTHON:-}" \
|
||||
"${PYTHON_BIN:-}" \
|
||||
"$(command -v python3 2>/dev/null)" \
|
||||
"$(command -v python 2>/dev/null)"
|
||||
}
|
||||
|
||||
# issue #195: per-invocation opt-out (PLANNING_DISABLED=1) for one-shot/CI
|
||||
# sessions that share a cwd with a plan but never opted into it.
|
||||
[ "${PLANNING_DISABLED:-}" = "1" ] && exit 0
|
||||
@@ -154,13 +168,24 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
# (Copied verbatim from resolve-plan-dir.sh so hook injection gets the same
|
||||
# symlink containment as the resolver — see security A1.3.)
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Matching is case-insensitive and works after slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils), then
|
||||
# readlink -f (older GNU), then the interpreter already validated by
|
||||
# select_python(). Prints the canonical absolute path on success; prints
|
||||
# nothing and returns 1 on a full miss so the caller can decide what to do.
|
||||
# The fallback must not rediscover or execute an unvalidated PATH interpreter.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
@@ -171,12 +196,8 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
if [ -n "${PWF_PYTHON:-}" ]; then
|
||||
out="$("${PWF_PYTHON}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -233,8 +254,28 @@ SCOPE=""
|
||||
EXPLICIT=0
|
||||
[ -n "$PLAN_PREFIX" ] && EXPLICIT=1
|
||||
[ "$SESSION_ATTACHED" = "1" ] && EXPLICIT=1
|
||||
if [ -n "${PLAN_ID:-}" ] && slug_is_valid "$PLAN_ID" && [ -d "${PLAN_PREFIX}.planning/${PLAN_ID}" ]; then
|
||||
RESOLVED="${PLAN_PREFIX}.planning/${PLAN_ID}"; SCOPE="scoped"; EXPLICIT=1
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
# A set PLAN_ID is a BINDING, not a hint (issue #237). This inline resolver
|
||||
# is the one the hooks actually run, so it carries the same rule as
|
||||
# resolve-plan-dir.sh: a selector that names no directory, fails slug
|
||||
# validation, or fails containment refuses instead of falling through to
|
||||
# .active_plan and newest-by-mtime. The fall-through is what let a
|
||||
# one-character typo inject a DIFFERENT plan while attest-plan.sh locked
|
||||
# that same wrong plan at rc=0.
|
||||
#
|
||||
# Unlike the PWF_PLAN_ROOT refusal above, the notice is userprompt-only.
|
||||
# pretool fires per tool call and precompact carries no plan body, so
|
||||
# printing on those would spam the transcript with the same line. The
|
||||
# userprompt fire is also the one plan-doctor.sh drives, so /plan-doctor
|
||||
# still sees and reports the state.
|
||||
if slug_is_valid "$PLAN_ID" && [ -d "${PLAN_PREFIX}.planning/${PLAN_ID}" ]; then
|
||||
RESOLVED="${PLAN_PREFIX}.planning/${PLAN_ID}"; SCOPE="scoped"; EXPLICIT=1
|
||||
else
|
||||
if [ "$CONTEXT" = "userprompt" ]; then
|
||||
echo "[planning-with-files] PLAN_ID does not name a plan directory under .planning: ${PLAN_ID} — nothing injected. Fix or unset the pin; a broken pin fails closed rather than selecting another plan."
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
elif [ -f "${PLAN_PREFIX}.planning/.active_plan" ]; then
|
||||
AP=$(tr -d '\r\n[:space:]' < "${PLAN_PREFIX}.planning/.active_plan" 2>/dev/null)
|
||||
if [ -n "$AP" ] && slug_is_valid "$AP" && [ -d "${PLAN_PREFIX}.planning/${AP}" ]; then
|
||||
@@ -256,9 +297,9 @@ fi
|
||||
if [ -z "$RESOLVED" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; then RESOLVED="${PLAN_PREFIX}."; SCOPE="root"; fi
|
||||
[ -z "$RESOLVED" ] && exit 0
|
||||
|
||||
# Do not probe or execute any interpreter until a real, contained plan exists.
|
||||
# This keeps opt-out and no-plan hook fires side-effect free even when an
|
||||
# untrusted PYTHON_BIN or PATH entry points at an executable canary.
|
||||
# Do not probe or execute any interpreter until a real plan exists. Before
|
||||
# containment, only an explicit PWF_TRUSTED_PYTHON or PYTHON_BIN may be used.
|
||||
# PATH discovery remains deferred until containment succeeds.
|
||||
if [ "$SCOPE" = "root" ]; then
|
||||
PRECHECK_PLAN_FILE="${PLAN_PREFIX}task_plan.md"
|
||||
else
|
||||
@@ -266,8 +307,9 @@ else
|
||||
fi
|
||||
[ -f "$PRECHECK_PLAN_FILE" ] || exit 0
|
||||
[ -L "$PRECHECK_PLAN_FILE" ] && exit 0
|
||||
PWF_PYTHON="$(select_explicit_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
is_within_root "$PRECHECK_PLAN_FILE" || exit 0
|
||||
PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
[ -n "$PWF_PYTHON" ] || PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
|
||||
# Session attachment is evaluated only after plan existence is proven. A
|
||||
# stale sessions directory without any plan must not cause interpreter probes.
|
||||
@@ -454,12 +496,16 @@ if [ "$SCOPE" = "root" ]; then
|
||||
PROGRESS_FILE="${PLAN_PREFIX}progress.md"
|
||||
ATTEST_FILE="${PLAN_PREFIX}.plan-attestation"
|
||||
MODE_FILE="${PLAN_PREFIX}.mode"
|
||||
ROOT_MODE_FILE=""
|
||||
NONCE_FILE="${PLAN_PREFIX}.nonce"
|
||||
else
|
||||
PLAN_FILE="${RESOLVED}/task_plan.md"
|
||||
PROGRESS_FILE="${RESOLVED}/progress.md"
|
||||
ATTEST_FILE="${RESOLVED}/.attestation"
|
||||
MODE_FILE="${RESOLVED}/.mode"
|
||||
# The project's own .mode, when it has one (issue #238). In root scope
|
||||
# MODE_FILE already IS that file, so the second source stays empty.
|
||||
ROOT_MODE_FILE="${PLAN_PREFIX}.mode"
|
||||
NONCE_FILE="${RESOLVED}/.nonce"
|
||||
fi
|
||||
[ -f "$PLAN_FILE" ] || exit 0
|
||||
@@ -831,11 +877,52 @@ fi
|
||||
# gated mode to legacy behavior (platform-critical: per-tool-call injection not
|
||||
# suppressed, oracle re-hash skipped, raw progress tail injected). Use a grep
|
||||
# token test, the same pattern check-complete.sh guard 1 uses.
|
||||
|
||||
# --- Root .mode is a FLOOR, not a default that slug scope replaces (#238). ---
|
||||
# A project makes attestation mandatory by committing a root .mode, which is a
|
||||
# reviewed project setting. Slug scope used to read ONLY the slug's .mode, and
|
||||
# init-session.sh writes no .mode unless --autonomous or --gated was passed, so
|
||||
# `init-session.sh <name>` produced a plan with no mode, no attestation
|
||||
# requirement and full injection: one agent-invocable command turned the
|
||||
# project's policy off.
|
||||
#
|
||||
# mode_has answers for a strictness-RAISING token: present in EITHER file. A
|
||||
# slug may opt into autonomous/gated where the root left it unset; it can no
|
||||
# longer opt out of what the root committed.
|
||||
#
|
||||
# mode_relax_allowed answers for the one strictness-LOWERING token
|
||||
# (plan-guard-off): the slug must carry it AND, when the project committed a
|
||||
# root .mode, that file must carry it too. A slug alone cannot switch off a
|
||||
# protection the project kept on.
|
||||
#
|
||||
# With no root .mode present ROOT_MODE_FILE is either empty (root scope) or
|
||||
# names a missing file, so the effective token set is exactly the slug's and
|
||||
# existing projects are byte-identical.
|
||||
mode_has() {
|
||||
_mh_token="$1"
|
||||
if [ -f "$MODE_FILE" ] && grep -q "$_mh_token" "$MODE_FILE" 2>/dev/null; then
|
||||
return 0
|
||||
fi
|
||||
if [ -n "$ROOT_MODE_FILE" ] && [ -f "$ROOT_MODE_FILE" ] \
|
||||
&& grep -q "$_mh_token" "$ROOT_MODE_FILE" 2>/dev/null; then
|
||||
return 0
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
mode_relax_allowed() {
|
||||
_mr_token="$1"
|
||||
[ -f "$MODE_FILE" ] || return 1
|
||||
grep -q "$_mr_token" "$MODE_FILE" 2>/dev/null || return 1
|
||||
if [ -n "$ROOT_MODE_FILE" ] && [ -f "$ROOT_MODE_FILE" ]; then
|
||||
grep -q "$_mr_token" "$ROOT_MODE_FILE" 2>/dev/null || return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
MODE=""
|
||||
if [ -f "$MODE_FILE" ]; then
|
||||
grep -q 'autonomous' "$MODE_FILE" 2>/dev/null && MODE='autonomous'
|
||||
grep -q 'gate' "$MODE_FILE" 2>/dev/null && MODE='gated'
|
||||
fi
|
||||
mode_has 'autonomous' && MODE='autonomous'
|
||||
mode_has 'gate' && MODE='gated'
|
||||
|
||||
# In autonomous/gated mode the per-tool-call injection is dropped (recitation
|
||||
# policy): strong models do not need the plan re-recited before every tool call,
|
||||
@@ -859,7 +946,7 @@ fi
|
||||
SMART=0
|
||||
if [ "${PWF_INJECT:-}" = "smart" ]; then
|
||||
SMART=1
|
||||
elif [ -f "$MODE_FILE" ] && grep -q 'inject-smart' "$MODE_FILE" 2>/dev/null; then
|
||||
elif mode_has 'inject-smart'; then
|
||||
SMART=1
|
||||
fi
|
||||
|
||||
@@ -1127,7 +1214,7 @@ esac
|
||||
# holding the stale copy. Per-session keying needs PWF_SESSION_ID, which most
|
||||
# hosts never set.
|
||||
GUARD=1
|
||||
[ -f "$MODE_FILE" ] && grep -q 'plan-guard-off' "$MODE_FILE" 2>/dev/null && GUARD=0
|
||||
mode_relax_allowed 'plan-guard-off' && GUARD=0
|
||||
[ "${PWF_PLAN_GUARD:-}" = "0" ] && GUARD=0
|
||||
if [ "$GUARD" = "1" ]; then
|
||||
# Same user-private cache root and same absolute-path key as the attestation
|
||||
|
||||
@@ -55,9 +55,14 @@ $validEvents = @("progress", "phase_complete", "error", "gate_block", "attest",
|
||||
function Resolve-PlanDir {
|
||||
$planRoot = Join-Path (Get-Location) ".planning"
|
||||
|
||||
# A set PLAN_ID is a BINDING, not a hint (issue #237). This script WRITES
|
||||
# ledger rows into the directory it picks, so falling through to
|
||||
# .active_plan, newest-by-mtime and finally the cwd after a mistyped pin
|
||||
# files another plan's run history.
|
||||
if ($env:PLAN_ID) {
|
||||
$candidate = Join-Path $planRoot $env:PLAN_ID
|
||||
if (Test-Path -LiteralPath $candidate -PathType Container) { return $candidate }
|
||||
return $null
|
||||
}
|
||||
|
||||
$activePointer = Join-Path $planRoot ".active_plan"
|
||||
@@ -136,6 +141,10 @@ if (-not $agentClean) { $agentClean = "main" }
|
||||
if ($Summary.Length -gt 200) { $Summary = $Summary.Substring(0, 200) }
|
||||
|
||||
$planDir = Resolve-PlanDir
|
||||
if (-not $planDir) {
|
||||
Write-Error "[ledger-append] An explicit PLAN_ID did not resolve to a plan directory; nothing was written and no other plan was substituted."
|
||||
exit 1
|
||||
}
|
||||
$ledgerFile = Join-Path $planDir ("ledger-" + $agentClean + ".jsonl")
|
||||
$lockFile = Join-Path $planDir ".ledger_lock"
|
||||
|
||||
|
||||
@@ -53,6 +53,12 @@ resolve_plan_dir() {
|
||||
printf "%s\n" "${plan_dir}"
|
||||
return 0
|
||||
fi
|
||||
# Explicit selectors are bindings, not hints (issue #237). This script
|
||||
# WRITES ledger rows into the plan dir it picks, so a legacy cwd fallback
|
||||
# after a rejected selector files another plan's run history.
|
||||
if [ -n "${PLAN_ID:-}" ] || [ -n "${PWF_PLAN_ROOT:-}" ]; then
|
||||
return 1
|
||||
fi
|
||||
# Legacy single-file mode: ledger lives beside ./task_plan.md at root.
|
||||
printf "%s\n" "."
|
||||
return 0
|
||||
@@ -274,7 +280,10 @@ AGENT="$(sanitize_agent "${AGENT}")"
|
||||
SUMMARY="$(printf '%s' "${SUMMARY}" | cut -c1-200)"
|
||||
SUMMARY="$(utf8_trim_incomplete "${SUMMARY}")"
|
||||
|
||||
PLAN_DIR="$(resolve_plan_dir)"
|
||||
PLAN_DIR="$(resolve_plan_dir)" || {
|
||||
printf "[ledger-append] An explicit PLAN_ID or PWF_PLAN_ROOT did not resolve to a plan directory; nothing was written and no other plan was substituted.\n" >&2
|
||||
exit 1
|
||||
}
|
||||
LEDGER_FILE="${PLAN_DIR}/ledger-${AGENT}.jsonl"
|
||||
LOCK_FILE="${PLAN_DIR}/.ledger_lock"
|
||||
|
||||
|
||||
@@ -31,9 +31,15 @@ $ErrorActionPreference = "Stop"
|
||||
function Resolve-PlanDir {
|
||||
$planRoot = Join-Path (Get-Location) ".planning"
|
||||
|
||||
# A set PLAN_ID is a BINDING, not a hint (issue #237). A selector that
|
||||
# names no plan directory stops resolution instead of falling through to
|
||||
# .active_plan, newest-by-mtime and finally the cwd: summarizing another
|
||||
# plan's ledger under a mistyped pin is the same wrong-plan harm that let
|
||||
# a typo attest the wrong file.
|
||||
if ($env:PLAN_ID) {
|
||||
$candidate = Join-Path $planRoot $env:PLAN_ID
|
||||
if (Test-Path -LiteralPath $candidate -PathType Container) { return $candidate }
|
||||
return $null
|
||||
}
|
||||
|
||||
$activePointer = Join-Path $planRoot ".active_plan"
|
||||
@@ -58,6 +64,15 @@ function Resolve-PlanDir {
|
||||
}
|
||||
|
||||
$planDir = Resolve-PlanDir
|
||||
if (-not $planDir) {
|
||||
# Loud degradation, same contract as ledger-summary.sh's emit_unavailable:
|
||||
# a rejected PLAN_ID binding must not report the ROOT plan's phase counts,
|
||||
# because an autonomous loop reads those counts as its termination signal.
|
||||
Write-Output "=== RUN LEDGER ==="
|
||||
Write-Output "ledger: unavailable (explicit PLAN_ID did not resolve)"
|
||||
Write-Output "=================="
|
||||
exit 0
|
||||
}
|
||||
$planFile = Join-Path $planDir "task_plan.md"
|
||||
|
||||
# --- Phase counts: same patterns as check-complete.ps1 ---
|
||||
|
||||
@@ -68,6 +68,15 @@ if [ -n "${ARG_DIR}" ]; then
|
||||
elif [ -f "${RESOLVER}" ]; then
|
||||
PLAN_DIR="$(sh "${RESOLVER}" 2>/dev/null)"
|
||||
if [ -z "${PLAN_DIR}" ] || [ ! -d "${PLAN_DIR}" ]; then
|
||||
# Explicit selectors are bindings, not hints (issue #237). A rejected
|
||||
# PLAN_ID or PWF_PLAN_ROOT must not fall back to the cwd: this summary
|
||||
# is injected into autonomous turns, so reporting the ROOT plan's
|
||||
# phase counts under a mistyped pin feeds the loop another plan's
|
||||
# termination signal. Degrade loudly, the same way a missing resolver
|
||||
# already does.
|
||||
if [ -n "${PLAN_ID:-}" ] || [ -n "${PWF_PLAN_ROOT:-}" ]; then
|
||||
emit_unavailable "explicit PLAN_ID or PWF_PLAN_ROOT did not resolve"
|
||||
fi
|
||||
PLAN_DIR="."
|
||||
fi
|
||||
else
|
||||
|
||||
@@ -42,10 +42,16 @@ $ErrorActionPreference = "Stop"
|
||||
function Resolve-PlanFile {
|
||||
$planRoot = Join-Path (Get-Location) ".planning"
|
||||
|
||||
# A set PLAN_ID is a BINDING, not a hint (issue #237). A selector that
|
||||
# names no plan directory stops resolution instead of falling through to
|
||||
# .active_plan and newest-by-mtime: this script reports phase state, and
|
||||
# answering a mistyped pin with a DIFFERENT plan's phases is the same
|
||||
# wrong-plan harm that let a typo attest the wrong file.
|
||||
if ($env:PLAN_ID) {
|
||||
$candidate = Join-Path $planRoot $env:PLAN_ID
|
||||
$planFile = Join-Path $candidate "task_plan.md"
|
||||
if (Test-Path -LiteralPath $planFile) { return (Resolve-Path -LiteralPath $planFile).Path }
|
||||
return $null
|
||||
}
|
||||
|
||||
$activePointer = Join-Path $planRoot ".active_plan"
|
||||
@@ -156,7 +162,11 @@ if ($validStatus -notcontains $Status) {
|
||||
|
||||
$planFile = Resolve-PlanFile
|
||||
if (-not $planFile) {
|
||||
Write-Error "[phase-status] No task_plan.md found. Create a plan first."
|
||||
if ($env:PLAN_ID) {
|
||||
Write-Error "[phase-status] PLAN_ID names no plan directory under .planning; nothing was written and no other plan was substituted."
|
||||
} else {
|
||||
Write-Error "[phase-status] No task_plan.md found. Create a plan first."
|
||||
}
|
||||
exit 1
|
||||
}
|
||||
|
||||
|
||||
@@ -40,6 +40,12 @@ resolve_plan_file() {
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
return 0
|
||||
fi
|
||||
# Explicit selectors are bindings, not hints (issue #237). This script
|
||||
# WRITES a phase status into the plan it picks, so a cwd fallback after a
|
||||
# rejected selector edits a different plan than the operator named.
|
||||
if [ -n "${PLAN_ID:-}" ] || [ -n "${PWF_PLAN_ROOT:-}" ]; then
|
||||
return 1
|
||||
fi
|
||||
if [ -f "./task_plan.md" ]; then
|
||||
printf "%s\n" "./task_plan.md"
|
||||
return 0
|
||||
@@ -73,7 +79,11 @@ case "${NEW_STATUS}" in
|
||||
esac
|
||||
|
||||
PLAN_FILE="$(resolve_plan_file)" || {
|
||||
printf "[phase-status] No task_plan.md found. Create a plan first.\n" >&2
|
||||
if [ -n "${PLAN_ID:-}" ] || [ -n "${PWF_PLAN_ROOT:-}" ]; then
|
||||
printf "[phase-status] An explicit PLAN_ID or PWF_PLAN_ROOT did not resolve to a plan; nothing was written and no other plan was substituted.\n" >&2
|
||||
else
|
||||
printf "[phase-status] No task_plan.md found. Create a plan first.\n" >&2
|
||||
fi
|
||||
exit 1
|
||||
}
|
||||
|
||||
|
||||
@@ -74,27 +74,49 @@ if [ -f "${INJ}" ]; then
|
||||
ok "injection: silent because no plan exists here (correct behavior)"
|
||||
fi
|
||||
else
|
||||
# Classify on the DATA FRAMING first, never on substrings of the whole
|
||||
# blob (issue #236). ${OUT} carries the plan body VERBATIM inside
|
||||
# ===BEGIN-PWF-DATA=== fences, so a bare substring test also matches
|
||||
# plan prose: a phase line reading "fix the false PLAN TAMPERED
|
||||
# warning" made the doctor report a hash mismatch on a correctly
|
||||
# attested plan.
|
||||
#
|
||||
# Every refusal path in inject-plan.sh prints its banner and exits
|
||||
# before frame_file runs, so a frame in the output proves injection
|
||||
# happened and rules out every refusal. Output WITHOUT a frame is by
|
||||
# construction a notice, which is why the banner arms sit under the
|
||||
# else side and the default arm warns instead of passing. A banner
|
||||
# whose wording drifts then degrades to a generic warning rather than
|
||||
# to a silent PASS: that is exactly how the stale
|
||||
# "PWF_PLAN_ROOT is not a directory" literal (which was never a
|
||||
# substring of what inject-plan.sh emits) reported PASS on a fully
|
||||
# dark-hooks state.
|
||||
case "${OUT}" in
|
||||
*'PLAN TAMPERED'*)
|
||||
*'===BEGIN-PWF-DATA'*)
|
||||
BYTES="$(printf '%s' "${OUT}" | wc -c | tr -d '[:space:]')"
|
||||
ok "injection: emits plan context (${BYTES} bytes)"
|
||||
;;
|
||||
*'[PLAN TAMPERED'*)
|
||||
warn "injection: plan is attested but the hash mismatches — run /plan-attest (or scripts/attest-plan.sh) to re-approve the current plan"
|
||||
;;
|
||||
*'requires attested plan'*)
|
||||
warn "injection: v3 mode without attestation — run attest-plan once to arm injection"
|
||||
;;
|
||||
*'Session isolation is armed'*)
|
||||
# Refusal notice, not plan context: reporting its byte count as
|
||||
# PASS told a dark user their hooks were fine.
|
||||
warn "injection: session isolation refuses this session — attach it with PWF_SESSION_ID=<id> plus .planning/sessions/<id>.attached, or delete the .planning/sessions/ dir (stale ones survive earlier Codex use and copied project trees) to turn isolation off"
|
||||
;;
|
||||
*'Ambiguous plan'*)
|
||||
warn "injection: nested-plan ambiguity — a project directly below this cwd carries its own plan, so hooks refuse to guess. Pin the thread with PWF_PLAN_ROOT=<absolute project root> or PLAN_ID=<slug>"
|
||||
;;
|
||||
*'PWF_PLAN_ROOT is not a directory'*)
|
||||
warn "injection: PWF_PLAN_ROOT points at a missing directory — fix or unset the pin; a broken pin fails closed and injects nothing"
|
||||
*'PWF_PLAN_ROOT is not a supported absolute local directory'*)
|
||||
warn "injection: PWF_PLAN_ROOT points at something that is not an absolute local directory — fix or unset the pin; a broken pin fails closed and injects nothing"
|
||||
;;
|
||||
*'PLAN_ID does not name a plan directory'*)
|
||||
warn "injection: PLAN_ID names no plan directory under .planning — fix or unset the pin; a set PLAN_ID is a binding and fails closed rather than selecting another plan"
|
||||
;;
|
||||
*)
|
||||
BYTES="$(printf '%s' "${OUT}" | wc -c | tr -d '[:space:]')"
|
||||
ok "injection: emits plan context (${BYTES} bytes)"
|
||||
warn "injection: inject-plan.sh emitted ${BYTES} bytes but no ===BEGIN-PWF-DATA frame, so no plan context reached the model. This is a refusal notice this doctor does not recognize; read it directly with: sh scripts/inject-plan.sh --context=userprompt"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
@@ -130,6 +130,13 @@ function Test-WithinRoot {
|
||||
|
||||
$activeFile = Join-Path $PlanRoot ".active_plan"
|
||||
|
||||
# A set PLAN_ID is a BINDING, not a hint (issue #237). A selector that names
|
||||
# no directory, fails slug validation, or fails containment terminates
|
||||
# resolution instead of falling through to .active_plan and newest-by-mtime:
|
||||
# the fall-through let a one-character typo attest and inject a DIFFERENT plan
|
||||
# at rc=0. Emptiness is the fail-closed signal on this channel, matching
|
||||
# resolve-plan-dir.sh and the PWF_PLAN_ROOT pin. An empty $env:PLAN_ID is
|
||||
# falsy here and still means "unset".
|
||||
if ($env:PLAN_ID) {
|
||||
if (Test-ValidSlug $env:PLAN_ID) {
|
||||
$candidate = Join-Path $PlanRoot $env:PLAN_ID
|
||||
@@ -138,16 +145,20 @@ if ($env:PLAN_ID) {
|
||||
exit 0
|
||||
}
|
||||
}
|
||||
exit 0
|
||||
}
|
||||
|
||||
if (Test-Path -LiteralPath $activeFile) {
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not $activeItem.PSIsContainer -and
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) {
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
} else {
|
||||
$planId = $null
|
||||
# Get-Item observes the link object even when its target is missing, unlike
|
||||
# Test-Path which follows the target. An active pointer that is a directory or
|
||||
# reparse point is an unsafe/ambiguous selector and must terminate resolution;
|
||||
# falling through would silently select and expose the newest unrelated plan.
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem) {
|
||||
if ($activeItem.PSIsContainer -or
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0)) {
|
||||
exit 0
|
||||
}
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
if ($planId -and (Test-ValidSlug $planId)) {
|
||||
$candidate = Join-Path $PlanRoot $planId
|
||||
if ((Test-Path $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
|
||||
|
||||
@@ -90,10 +90,54 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
@@ -105,12 +149,9 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -180,7 +221,8 @@ is_within_root() {
|
||||
}
|
||||
|
||||
# Portable mtime resolver. Tries GNU stat, BSD stat, BSD/macOS date -r,
|
||||
# python3, then perl. Returns "0" on full miss so callers can sort.
|
||||
# then an explicitly trusted Python interpreter. Returns "0" on a full miss
|
||||
# so newest-plan selection fails closed instead of executing from PATH.
|
||||
mtime_of() {
|
||||
target="$1"
|
||||
out="$(stat -c '%Y' "${target}" 2>/dev/null)"
|
||||
@@ -189,16 +231,9 @@ mtime_of() {
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
out="$(date -r "${target}" +%s 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
out="$(perl -e 'print((stat shift)[9])' "${target}" 2>/dev/null)"
|
||||
_mtime_python="$(trusted_python)" || _mtime_python=""
|
||||
if [ -n "${_mtime_python}" ]; then
|
||||
out="$("${_mtime_python}" -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
printf "0\n"
|
||||
@@ -262,7 +297,34 @@ resolve_latest_dir() {
|
||||
return 1
|
||||
}
|
||||
|
||||
if resolve_from_env; then exit 0; fi
|
||||
# A set PLAN_ID is a BINDING, not a hint (issue #237).
|
||||
#
|
||||
# resolve_from_env returns 1 both when no selector was set and when the
|
||||
# selector was rejected, so continuing the chain after it turned a
|
||||
# one-character typo into a silent switch: .active_plan or newest-by-mtime
|
||||
# answered instead, attest-plan.sh locked THAT plan at rc=0, and injection
|
||||
# followed the attestation onto it. commands/plan-attest.md already promised
|
||||
# the opposite ("It never falls back to another plan").
|
||||
#
|
||||
# Any non-empty PLAN_ID therefore terminates resolution here, whether it was
|
||||
# rejected for slug shape (traversal), for naming no directory, or for failing
|
||||
# containment. The caller receives an empty result and takes its own
|
||||
# fail-closed path rather than a different plan. PWF_PLAN_ROOT, the sibling
|
||||
# selector, has failed closed on any bad value since #212; the two selectors
|
||||
# now agree.
|
||||
#
|
||||
# An EMPTY PLAN_ID still means "unset": init-session.sh passes
|
||||
# PLAN_ID="${PLAN_ID:-}" into attest-plan.sh on the legacy path and depends on
|
||||
# that spelling resolving the root plan.
|
||||
#
|
||||
# Exit status stays 0 on the refusal (see the header contract). Emptiness is
|
||||
# the fail-closed signal on this channel, exactly as the PWF_PLAN_ROOT guard
|
||||
# above already does it; a non-zero status would kill callers running under
|
||||
# set -e for a condition that is not an internal error.
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
resolve_from_env && exit 0
|
||||
exit 0
|
||||
fi
|
||||
if resolve_from_active_file; then exit 0; fi
|
||||
if resolve_latest_dir; then exit 0; fi
|
||||
exit 0
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
"name": "planning-with-files",
|
||||
"source": "./",
|
||||
"description": "Persistent project planning files with lifecycle hooks that inject selected plan context. Automatic recovery uses project files only. Explicit catchup modes may read same-project local session records to emit aggregate counts or bounded nonce-framed excerpts. Optional gated mode can request continuation on capable hosts and never runs commands declared in Markdown. No network upload path. Installs across 60+ agents.",
|
||||
"version": "3.12.0"
|
||||
"version": "3.16.0"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "planning-with-files",
|
||||
"version": "3.12.0",
|
||||
"version": "3.16.0",
|
||||
"description": "Persistent project planning files with lifecycle hooks that inject selected plan context. Automatic recovery uses project files only. Explicit catchup modes may read same-project local session records to emit aggregate counts or bounded nonce-framed excerpts. Optional gated mode can request continuation on capable hosts and never runs commands declared in Markdown. No network upload path. Works across 60+ agents and includes Arabic, German, Spanish, Simplified Chinese, and Traditional Chinese.",
|
||||
"author": {
|
||||
"name": "OthmanAdi",
|
||||
|
||||
@@ -36,7 +36,7 @@ hooks:
|
||||
- type: command
|
||||
command: "SH=\"\"; for c in \"${PWF_SCRIPT_DIR}/inject-plan.sh\" \"${CLAUDE_SKILL_DIR}/scripts/inject-plan.sh\" \"${CODEBUDDY_PLUGIN_ROOT}/scripts/inject-plan.sh\" \"$HOME/.codebuddy/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/inject-plan.sh\"; do [ -f \"$c\" ] && { SH=\"$c\"; break; }; done; [ -n \"$SH\" ] && sh \"$SH\" --context=precompact; exit 0"
|
||||
metadata:
|
||||
version: "3.12.0"
|
||||
version: "3.16.0"
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -32,6 +32,9 @@ param(
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
if (-not $script:IsWindowsHost) {
|
||||
throw "Safe no-follow descriptor operations are unavailable in this PowerShell script on Unix. Use scripts/attest-plan.sh instead."
|
||||
}
|
||||
if ($script:IsWindowsHost -and -not ("PwfAttestationNative" -as [type])) {
|
||||
Add-Type -TypeDefinition @'
|
||||
using System;
|
||||
@@ -382,6 +385,21 @@ function Resolve-ContainedPlanFile {
|
||||
} catch { return $null }
|
||||
}
|
||||
|
||||
function Test-SlugPlanDirectory {
|
||||
param([string] $Directory)
|
||||
try {
|
||||
$finalDirectory = [PwfAttestationNative]::FinalDirectoryPath($Directory)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
$planningDirectory = Split-Path -Parent $finalDirectory
|
||||
$planId = Split-Path -Leaf $finalDirectory
|
||||
return (
|
||||
(Split-Path -Leaf $planningDirectory) -eq ".planning" -and
|
||||
$planId -match '^[A-Za-z0-9_][A-Za-z0-9._-]*$'
|
||||
)
|
||||
}
|
||||
|
||||
function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
@@ -395,10 +413,17 @@ function Resolve-PlanFile {
|
||||
# fall through and attest an unrelated legacy-root plan.
|
||||
if ($env:PWF_PLAN_ROOT -or $env:PLAN_ID) { return $null }
|
||||
$activePointer = Join-Path (Join-Path (Get-Location) ".planning") ".active_plan"
|
||||
if (Test-Path -LiteralPath $activePointer) { return $null }
|
||||
$activePointerItem = Get-Item -LiteralPath $activePointer -Force -ErrorAction SilentlyContinue
|
||||
if ($activePointerItem) { return $null }
|
||||
|
||||
$legacy = Join-Path (Get-Location) "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory (Get-Location).Path)
|
||||
$currentDirectory = (Get-Location).Path
|
||||
if (Test-SlugPlanDirectory $currentDirectory) {
|
||||
$slugPlan = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $slugPlan -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
$legacy = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
function Get-AttestationPath {
|
||||
@@ -406,6 +431,9 @@ function Get-AttestationPath {
|
||||
$planDir = Split-Path -Parent $PlanFile
|
||||
$cwd = (Get-Location).Path
|
||||
if ($planDir -eq $cwd) {
|
||||
if (Test-SlugPlanDirectory $cwd) {
|
||||
return (Join-Path $cwd ".attestation")
|
||||
}
|
||||
return (Join-Path $cwd ".plan-attestation")
|
||||
}
|
||||
return (Join-Path $planDir ".attestation")
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
# 1. $PLAN_ID env var → ./.planning/$PLAN_ID/
|
||||
# 2. ./.planning/.active_plan
|
||||
# 3. Newest ./.planning/<dir>/ by mtime
|
||||
# 4. Legacy ./task_plan.md at project root
|
||||
# 4. Current directory when it is .planning/<valid-slug>/
|
||||
# 5. Legacy ./task_plan.md at project root
|
||||
#
|
||||
# Usage:
|
||||
# sh scripts/attest-plan.sh # attest the active plan
|
||||
@@ -21,6 +22,25 @@ set -u
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
RESOLVER="${SCRIPT_DIR}/resolve-plan-dir.sh"
|
||||
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
resolve_from_slug_cwd() {
|
||||
slug_cwd="$(pwd -P 2>/dev/null)" || return 1
|
||||
planning_dir="${slug_cwd%/*}"
|
||||
[ "${planning_dir##*/}" = ".planning" ] || return 1
|
||||
plan_id="${slug_cwd##*/}"
|
||||
slug_is_valid "${plan_id}" || return 1
|
||||
[ -f "${slug_cwd}/task_plan.md" ] || return 1
|
||||
printf "%s\n" "${slug_cwd}/task_plan.md"
|
||||
}
|
||||
|
||||
resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
@@ -30,6 +50,22 @@ resolve_plan_file() {
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Explicit selectors are bindings, not hints. If the shared resolver
|
||||
# rejected one, do not attest a different plan through a cwd fallback.
|
||||
if [ -n "${PWF_PLAN_ROOT:-}" ] || [ -n "${PLAN_ID:-}" ]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
# An absolute script path does not change the invoking shell's cwd. When
|
||||
# that cwd is a slug plan directory, keep slug-mode storage semantics
|
||||
# instead of misclassifying its task_plan.md as a legacy root plan.
|
||||
slug_plan_file="$(resolve_from_slug_cwd)" || slug_plan_file=""
|
||||
if [ -n "${slug_plan_file}" ]; then
|
||||
printf "%s\n" "${slug_plan_file}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "./task_plan.md" ]; then
|
||||
printf "%s\n" "./task_plan.md"
|
||||
return 0
|
||||
@@ -72,7 +108,18 @@ case "${1:-}" in
|
||||
esac
|
||||
|
||||
plan_file="$(resolve_plan_file)" || {
|
||||
printf "[plan-attest] No task_plan.md found. Create a plan first.\n" >&2
|
||||
# Name the actual cause. "No task_plan.md found" is true but misleading
|
||||
# when the plan exists and an explicit selector was rejected: before #237
|
||||
# a mistyped PLAN_ID attested a DIFFERENT plan at rc=0, and an operator
|
||||
# who now sees a generic not-found is likely to go looking for the wrong
|
||||
# problem. The selectors are bindings, so say which one refused.
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
printf "[plan-attest] PLAN_ID=%s names no plan directory under .planning. An explicit selector is a binding: nothing was attested and no other plan was substituted.\n" "${PLAN_ID}" >&2
|
||||
elif [ -n "${PWF_PLAN_ROOT:-}" ]; then
|
||||
printf "[plan-attest] PWF_PLAN_ROOT=%s did not resolve to a project root holding a plan. An explicit pin is a binding: nothing was attested and no other plan was substituted.\n" "${PWF_PLAN_ROOT}" >&2
|
||||
else
|
||||
printf "[plan-attest] No task_plan.md found. Create a plan first.\n" >&2
|
||||
fi
|
||||
exit 1
|
||||
}
|
||||
|
||||
|
||||
@@ -107,13 +107,27 @@ if (-not $Gate) {
|
||||
|
||||
# ---- Gate path (-Gate). Resolves to advisory unless every guard says block. ----
|
||||
|
||||
# Guard 1: gated mode. The .mode file must contain "gate".
|
||||
# Guard 1: gated mode. A .mode file must contain "gate".
|
||||
#
|
||||
# The project's root .mode is a FLOOR, not a default that slug scope replaces
|
||||
# (issue #238). Reading only <plan-dir>\.mode let a slug plan with no .mode
|
||||
# drop a project-committed gate. "gate" from EITHER file arms the gate; a slug
|
||||
# may raise strictness, never lower it. In root scope $PlanDir already IS the
|
||||
# project root, so the second source is skipped and behavior is unchanged.
|
||||
$modeFile = Join-Path $PlanDir ".mode"
|
||||
$rootForMode = if ($env:PWF_PLAN_ROOT) { $env:PWF_PLAN_ROOT } else { "." }
|
||||
$rootModeFile = $null
|
||||
if ($PlanDir -ne $rootForMode -and $PlanDir -ne ".") {
|
||||
$rootModeFile = Join-Path $rootForMode ".mode"
|
||||
}
|
||||
$gatedMode = $false
|
||||
if (Test-Path $modeFile) {
|
||||
$modeContent = Get-Content $modeFile -Raw -ErrorAction SilentlyContinue
|
||||
foreach ($candidateMode in @($modeFile, $rootModeFile)) {
|
||||
if (-not $candidateMode) { continue }
|
||||
if (-not (Test-Path $candidateMode)) { continue }
|
||||
$modeContent = Get-Content $candidateMode -Raw -ErrorAction SilentlyContinue
|
||||
if ($null -ne $modeContent -and $modeContent -match "gate") {
|
||||
$gatedMode = $true
|
||||
break
|
||||
}
|
||||
}
|
||||
if (-not $gatedMode) {
|
||||
|
||||
@@ -60,6 +60,14 @@ else
|
||||
if [ -n "${RESOLVED_DIR}" ] && [ -f "${RESOLVED_DIR}/task_plan.md" ]; then
|
||||
PLAN_FILE="${RESOLVED_DIR}/task_plan.md"
|
||||
PLAN_DIR="${RESOLVED_DIR}"
|
||||
elif [ -n "${PLAN_ID:-}" ] || [ -n "${PWF_PLAN_ROOT:-}" ]; then
|
||||
# Explicit selectors are bindings, not hints (issue #237). The shared
|
||||
# resolver rejected one, so the legacy cwd fallback below must not run:
|
||||
# answering a mistyped pin with the ROOT plan's completion state is the
|
||||
# same wrong-plan harm the binding removes, and here it would decide
|
||||
# whether an autonomous run is allowed to stop.
|
||||
echo "[planning-with-files] An explicit PLAN_ID or PWF_PLAN_ROOT did not resolve to a plan; no completion state was read and no other plan was substituted."
|
||||
exit 0
|
||||
else
|
||||
PLAN_FILE="task_plan.md"
|
||||
PLAN_DIR="."
|
||||
@@ -131,10 +139,30 @@ fi
|
||||
|
||||
# ---- Gate path (--gate). Resolves to advisory unless every guard says block. ----
|
||||
|
||||
# Guard 1: gated mode. The .mode file must contain "gate". Absent or other
|
||||
# Guard 1: gated mode. A .mode file must contain "gate". Absent or other
|
||||
# content means advisory mode (legacy behavior preserved).
|
||||
#
|
||||
# The project's root .mode is a FLOOR, not a default that slug scope replaces
|
||||
# (issue #238). Reading only <plan-dir>/.mode let a slug plan with no .mode
|
||||
# drop a project-committed gate, the same way it dropped the attestation
|
||||
# requirement in inject-plan.sh. "gate" from EITHER file arms the gate; a slug
|
||||
# may raise strictness, never lower it. In root scope PLAN_DIR already IS the
|
||||
# project root, so the second source stays empty and behavior is unchanged.
|
||||
MODE_FILE="${PLAN_DIR}/.mode"
|
||||
if [ ! -f "${MODE_FILE}" ] || ! grep -q "gate" "${MODE_FILE}" 2>/dev/null; then
|
||||
ROOT_MODE_FILE=""
|
||||
_root_for_mode="${PWF_PLAN_ROOT:-.}"
|
||||
if [ "${PLAN_DIR}" != "${_root_for_mode}" ] && [ "${PLAN_DIR}" != "." ]; then
|
||||
ROOT_MODE_FILE="${_root_for_mode}/.mode"
|
||||
fi
|
||||
GATED=0
|
||||
if [ -f "${MODE_FILE}" ] && grep -q "gate" "${MODE_FILE}" 2>/dev/null; then
|
||||
GATED=1
|
||||
fi
|
||||
if [ "${GATED}" -eq 0 ] && [ -n "${ROOT_MODE_FILE}" ] && [ -f "${ROOT_MODE_FILE}" ] \
|
||||
&& grep -q "gate" "${ROOT_MODE_FILE}" 2>/dev/null; then
|
||||
GATED=1
|
||||
fi
|
||||
if [ "${GATED}" -eq 0 ]; then
|
||||
advisory_report
|
||||
exit 0
|
||||
fi
|
||||
|
||||
@@ -152,6 +152,33 @@ gen_nonce() {
|
||||
# $1 = plan dir (absolute or relative); dotfiles live directly inside it.
|
||||
# $2 = plan file path (task_plan.md) used for auto-attestation resolution.
|
||||
# No-op when MODE is empty (legacy path stays byte-equivalent to v2.43.0).
|
||||
# Raise MODE to the project's committed floor before the side effects run
|
||||
# (issue #238). A project that ships a root .mode has made that setting a
|
||||
# reviewed part of the repo; a new slug plan must not start below it. Without
|
||||
# this, `init-session.sh <name>` created a plan with no .mode at all, and the
|
||||
# project's attestation requirement became a flag the agent chose at plan
|
||||
# creation time.
|
||||
#
|
||||
# inject-plan.sh enforces the same floor at read time, so this is not the
|
||||
# guard. It exists so the effective policy is VISIBLE in the plan directory
|
||||
# rather than only inside the resolver, and so the new plan gets the nonce and
|
||||
# the auto-attestation that autonomous mode needs to inject at all.
|
||||
#
|
||||
# An explicit --autonomous/--gated is never lowered: gated stays gated.
|
||||
inherit_root_mode() {
|
||||
_root_mode="${PWD}/.mode"
|
||||
[ -f "${_root_mode}" ] || return 0
|
||||
[ "$MODE" = "gated" ] && return 0
|
||||
if grep -q 'gate' "${_root_mode}" 2>/dev/null; then
|
||||
MODE='gated'
|
||||
return 0
|
||||
fi
|
||||
if grep -q 'autonomous' "${_root_mode}" 2>/dev/null; then
|
||||
MODE='autonomous'
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
apply_v3_mode() {
|
||||
_mode_dir="$1"
|
||||
_mode_plan="$2"
|
||||
@@ -367,6 +394,7 @@ if [ "$SLUG_MODE" -eq 1 ]; then
|
||||
echo "PLAN_ID=$PLAN_ID"
|
||||
create_files_in "$PLAN_DIR"
|
||||
printf "%s\n" "$PLAN_ID" > "${PLAN_ROOT}/.active_plan"
|
||||
inherit_root_mode
|
||||
apply_v3_mode "$PLAN_DIR" "${PLAN_DIR}/task_plan.md"
|
||||
echo ""
|
||||
echo "Active plan recorded: ${PLAN_ROOT}/.active_plan"
|
||||
|
||||
@@ -27,27 +27,26 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Select a working interpreter, not merely the first executable name on PATH.
|
||||
# Validate candidate interpreters supplied by the selector wrappers below.
|
||||
# Windows Store app aliases can exist as python3.exe while refusing every
|
||||
# script invocation. Probe candidates privately and fail closed if none runs.
|
||||
select_python() {
|
||||
# PWF_TRUSTED_PYTHON is the explicit trust path. PYTHON_BIN remains a
|
||||
# compatibility alias. PATH discovery is a deliberate fallback: the hook
|
||||
# treats the caller's PATH as executable trust, but still requires the
|
||||
# resolved candidate to be an absolute regular executable.
|
||||
for _sp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}" "$(command -v python3 2>/dev/null)" "$(command -v python 2>/dev/null)"; do
|
||||
select_python_candidates() {
|
||||
for _sp_candidate in "$@"; do
|
||||
[ -n "$_sp_candidate" ] || continue
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
case "$_sp_candidate" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
# Git Bash cannot reliably test or invoke C:\... spelling.
|
||||
# Convert before every filesystem predicate and invocation.
|
||||
command -v cygpath >/dev/null 2>&1 || continue
|
||||
_sp_candidate="$(cygpath -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
# Convert with Git Bash's fixed system helper, never PATH.
|
||||
_sp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "$_sp_cygpath" ] && [ -x "$_sp_cygpath" ] || continue
|
||||
_sp_candidate="$("$_sp_cygpath" -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
[ -f "$_sp_candidate" ] || continue
|
||||
[ -x "$_sp_candidate" ] || continue
|
||||
if "$_sp_candidate" -c 'import sys; raise SystemExit(0 if sys.version_info >= (3, 8) else 1)' >/dev/null 2>&1; then
|
||||
@@ -58,6 +57,21 @@ select_python() {
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment may use only an interpreter path the caller explicitly trusted.
|
||||
select_explicit_python() {
|
||||
select_python_candidates "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"
|
||||
}
|
||||
|
||||
# After containment succeeds, PATH discovery remains a compatibility fallback
|
||||
# for hosts that do not export an interpreter path to direct hook invocations.
|
||||
select_python() {
|
||||
select_python_candidates \
|
||||
"${PWF_TRUSTED_PYTHON:-}" \
|
||||
"${PYTHON_BIN:-}" \
|
||||
"$(command -v python3 2>/dev/null)" \
|
||||
"$(command -v python 2>/dev/null)"
|
||||
}
|
||||
|
||||
# issue #195: per-invocation opt-out (PLANNING_DISABLED=1) for one-shot/CI
|
||||
# sessions that share a cwd with a plan but never opted into it.
|
||||
[ "${PLANNING_DISABLED:-}" = "1" ] && exit 0
|
||||
@@ -154,13 +168,24 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
# (Copied verbatim from resolve-plan-dir.sh so hook injection gets the same
|
||||
# symlink containment as the resolver — see security A1.3.)
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Matching is case-insensitive and works after slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils), then
|
||||
# readlink -f (older GNU), then the interpreter already validated by
|
||||
# select_python(). Prints the canonical absolute path on success; prints
|
||||
# nothing and returns 1 on a full miss so the caller can decide what to do.
|
||||
# The fallback must not rediscover or execute an unvalidated PATH interpreter.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
@@ -171,12 +196,8 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
if [ -n "${PWF_PYTHON:-}" ]; then
|
||||
out="$("${PWF_PYTHON}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -233,8 +254,28 @@ SCOPE=""
|
||||
EXPLICIT=0
|
||||
[ -n "$PLAN_PREFIX" ] && EXPLICIT=1
|
||||
[ "$SESSION_ATTACHED" = "1" ] && EXPLICIT=1
|
||||
if [ -n "${PLAN_ID:-}" ] && slug_is_valid "$PLAN_ID" && [ -d "${PLAN_PREFIX}.planning/${PLAN_ID}" ]; then
|
||||
RESOLVED="${PLAN_PREFIX}.planning/${PLAN_ID}"; SCOPE="scoped"; EXPLICIT=1
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
# A set PLAN_ID is a BINDING, not a hint (issue #237). This inline resolver
|
||||
# is the one the hooks actually run, so it carries the same rule as
|
||||
# resolve-plan-dir.sh: a selector that names no directory, fails slug
|
||||
# validation, or fails containment refuses instead of falling through to
|
||||
# .active_plan and newest-by-mtime. The fall-through is what let a
|
||||
# one-character typo inject a DIFFERENT plan while attest-plan.sh locked
|
||||
# that same wrong plan at rc=0.
|
||||
#
|
||||
# Unlike the PWF_PLAN_ROOT refusal above, the notice is userprompt-only.
|
||||
# pretool fires per tool call and precompact carries no plan body, so
|
||||
# printing on those would spam the transcript with the same line. The
|
||||
# userprompt fire is also the one plan-doctor.sh drives, so /plan-doctor
|
||||
# still sees and reports the state.
|
||||
if slug_is_valid "$PLAN_ID" && [ -d "${PLAN_PREFIX}.planning/${PLAN_ID}" ]; then
|
||||
RESOLVED="${PLAN_PREFIX}.planning/${PLAN_ID}"; SCOPE="scoped"; EXPLICIT=1
|
||||
else
|
||||
if [ "$CONTEXT" = "userprompt" ]; then
|
||||
echo "[planning-with-files] PLAN_ID does not name a plan directory under .planning: ${PLAN_ID} — nothing injected. Fix or unset the pin; a broken pin fails closed rather than selecting another plan."
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
elif [ -f "${PLAN_PREFIX}.planning/.active_plan" ]; then
|
||||
AP=$(tr -d '\r\n[:space:]' < "${PLAN_PREFIX}.planning/.active_plan" 2>/dev/null)
|
||||
if [ -n "$AP" ] && slug_is_valid "$AP" && [ -d "${PLAN_PREFIX}.planning/${AP}" ]; then
|
||||
@@ -256,9 +297,9 @@ fi
|
||||
if [ -z "$RESOLVED" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; then RESOLVED="${PLAN_PREFIX}."; SCOPE="root"; fi
|
||||
[ -z "$RESOLVED" ] && exit 0
|
||||
|
||||
# Do not probe or execute any interpreter until a real, contained plan exists.
|
||||
# This keeps opt-out and no-plan hook fires side-effect free even when an
|
||||
# untrusted PYTHON_BIN or PATH entry points at an executable canary.
|
||||
# Do not probe or execute any interpreter until a real plan exists. Before
|
||||
# containment, only an explicit PWF_TRUSTED_PYTHON or PYTHON_BIN may be used.
|
||||
# PATH discovery remains deferred until containment succeeds.
|
||||
if [ "$SCOPE" = "root" ]; then
|
||||
PRECHECK_PLAN_FILE="${PLAN_PREFIX}task_plan.md"
|
||||
else
|
||||
@@ -266,8 +307,9 @@ else
|
||||
fi
|
||||
[ -f "$PRECHECK_PLAN_FILE" ] || exit 0
|
||||
[ -L "$PRECHECK_PLAN_FILE" ] && exit 0
|
||||
PWF_PYTHON="$(select_explicit_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
is_within_root "$PRECHECK_PLAN_FILE" || exit 0
|
||||
PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
[ -n "$PWF_PYTHON" ] || PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
|
||||
# Session attachment is evaluated only after plan existence is proven. A
|
||||
# stale sessions directory without any plan must not cause interpreter probes.
|
||||
@@ -454,12 +496,16 @@ if [ "$SCOPE" = "root" ]; then
|
||||
PROGRESS_FILE="${PLAN_PREFIX}progress.md"
|
||||
ATTEST_FILE="${PLAN_PREFIX}.plan-attestation"
|
||||
MODE_FILE="${PLAN_PREFIX}.mode"
|
||||
ROOT_MODE_FILE=""
|
||||
NONCE_FILE="${PLAN_PREFIX}.nonce"
|
||||
else
|
||||
PLAN_FILE="${RESOLVED}/task_plan.md"
|
||||
PROGRESS_FILE="${RESOLVED}/progress.md"
|
||||
ATTEST_FILE="${RESOLVED}/.attestation"
|
||||
MODE_FILE="${RESOLVED}/.mode"
|
||||
# The project's own .mode, when it has one (issue #238). In root scope
|
||||
# MODE_FILE already IS that file, so the second source stays empty.
|
||||
ROOT_MODE_FILE="${PLAN_PREFIX}.mode"
|
||||
NONCE_FILE="${RESOLVED}/.nonce"
|
||||
fi
|
||||
[ -f "$PLAN_FILE" ] || exit 0
|
||||
@@ -831,11 +877,52 @@ fi
|
||||
# gated mode to legacy behavior (platform-critical: per-tool-call injection not
|
||||
# suppressed, oracle re-hash skipped, raw progress tail injected). Use a grep
|
||||
# token test, the same pattern check-complete.sh guard 1 uses.
|
||||
|
||||
# --- Root .mode is a FLOOR, not a default that slug scope replaces (#238). ---
|
||||
# A project makes attestation mandatory by committing a root .mode, which is a
|
||||
# reviewed project setting. Slug scope used to read ONLY the slug's .mode, and
|
||||
# init-session.sh writes no .mode unless --autonomous or --gated was passed, so
|
||||
# `init-session.sh <name>` produced a plan with no mode, no attestation
|
||||
# requirement and full injection: one agent-invocable command turned the
|
||||
# project's policy off.
|
||||
#
|
||||
# mode_has answers for a strictness-RAISING token: present in EITHER file. A
|
||||
# slug may opt into autonomous/gated where the root left it unset; it can no
|
||||
# longer opt out of what the root committed.
|
||||
#
|
||||
# mode_relax_allowed answers for the one strictness-LOWERING token
|
||||
# (plan-guard-off): the slug must carry it AND, when the project committed a
|
||||
# root .mode, that file must carry it too. A slug alone cannot switch off a
|
||||
# protection the project kept on.
|
||||
#
|
||||
# With no root .mode present ROOT_MODE_FILE is either empty (root scope) or
|
||||
# names a missing file, so the effective token set is exactly the slug's and
|
||||
# existing projects are byte-identical.
|
||||
mode_has() {
|
||||
_mh_token="$1"
|
||||
if [ -f "$MODE_FILE" ] && grep -q "$_mh_token" "$MODE_FILE" 2>/dev/null; then
|
||||
return 0
|
||||
fi
|
||||
if [ -n "$ROOT_MODE_FILE" ] && [ -f "$ROOT_MODE_FILE" ] \
|
||||
&& grep -q "$_mh_token" "$ROOT_MODE_FILE" 2>/dev/null; then
|
||||
return 0
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
mode_relax_allowed() {
|
||||
_mr_token="$1"
|
||||
[ -f "$MODE_FILE" ] || return 1
|
||||
grep -q "$_mr_token" "$MODE_FILE" 2>/dev/null || return 1
|
||||
if [ -n "$ROOT_MODE_FILE" ] && [ -f "$ROOT_MODE_FILE" ]; then
|
||||
grep -q "$_mr_token" "$ROOT_MODE_FILE" 2>/dev/null || return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
MODE=""
|
||||
if [ -f "$MODE_FILE" ]; then
|
||||
grep -q 'autonomous' "$MODE_FILE" 2>/dev/null && MODE='autonomous'
|
||||
grep -q 'gate' "$MODE_FILE" 2>/dev/null && MODE='gated'
|
||||
fi
|
||||
mode_has 'autonomous' && MODE='autonomous'
|
||||
mode_has 'gate' && MODE='gated'
|
||||
|
||||
# In autonomous/gated mode the per-tool-call injection is dropped (recitation
|
||||
# policy): strong models do not need the plan re-recited before every tool call,
|
||||
@@ -859,7 +946,7 @@ fi
|
||||
SMART=0
|
||||
if [ "${PWF_INJECT:-}" = "smart" ]; then
|
||||
SMART=1
|
||||
elif [ -f "$MODE_FILE" ] && grep -q 'inject-smart' "$MODE_FILE" 2>/dev/null; then
|
||||
elif mode_has 'inject-smart'; then
|
||||
SMART=1
|
||||
fi
|
||||
|
||||
@@ -1127,7 +1214,7 @@ esac
|
||||
# holding the stale copy. Per-session keying needs PWF_SESSION_ID, which most
|
||||
# hosts never set.
|
||||
GUARD=1
|
||||
[ -f "$MODE_FILE" ] && grep -q 'plan-guard-off' "$MODE_FILE" 2>/dev/null && GUARD=0
|
||||
mode_relax_allowed 'plan-guard-off' && GUARD=0
|
||||
[ "${PWF_PLAN_GUARD:-}" = "0" ] && GUARD=0
|
||||
if [ "$GUARD" = "1" ]; then
|
||||
# Same user-private cache root and same absolute-path key as the attestation
|
||||
|
||||
@@ -68,6 +68,15 @@ if [ -n "${ARG_DIR}" ]; then
|
||||
elif [ -f "${RESOLVER}" ]; then
|
||||
PLAN_DIR="$(sh "${RESOLVER}" 2>/dev/null)"
|
||||
if [ -z "${PLAN_DIR}" ] || [ ! -d "${PLAN_DIR}" ]; then
|
||||
# Explicit selectors are bindings, not hints (issue #237). A rejected
|
||||
# PLAN_ID or PWF_PLAN_ROOT must not fall back to the cwd: this summary
|
||||
# is injected into autonomous turns, so reporting the ROOT plan's
|
||||
# phase counts under a mistyped pin feeds the loop another plan's
|
||||
# termination signal. Degrade loudly, the same way a missing resolver
|
||||
# already does.
|
||||
if [ -n "${PLAN_ID:-}" ] || [ -n "${PWF_PLAN_ROOT:-}" ]; then
|
||||
emit_unavailable "explicit PLAN_ID or PWF_PLAN_ROOT did not resolve"
|
||||
fi
|
||||
PLAN_DIR="."
|
||||
fi
|
||||
else
|
||||
|
||||
@@ -74,27 +74,49 @@ if [ -f "${INJ}" ]; then
|
||||
ok "injection: silent because no plan exists here (correct behavior)"
|
||||
fi
|
||||
else
|
||||
# Classify on the DATA FRAMING first, never on substrings of the whole
|
||||
# blob (issue #236). ${OUT} carries the plan body VERBATIM inside
|
||||
# ===BEGIN-PWF-DATA=== fences, so a bare substring test also matches
|
||||
# plan prose: a phase line reading "fix the false PLAN TAMPERED
|
||||
# warning" made the doctor report a hash mismatch on a correctly
|
||||
# attested plan.
|
||||
#
|
||||
# Every refusal path in inject-plan.sh prints its banner and exits
|
||||
# before frame_file runs, so a frame in the output proves injection
|
||||
# happened and rules out every refusal. Output WITHOUT a frame is by
|
||||
# construction a notice, which is why the banner arms sit under the
|
||||
# else side and the default arm warns instead of passing. A banner
|
||||
# whose wording drifts then degrades to a generic warning rather than
|
||||
# to a silent PASS: that is exactly how the stale
|
||||
# "PWF_PLAN_ROOT is not a directory" literal (which was never a
|
||||
# substring of what inject-plan.sh emits) reported PASS on a fully
|
||||
# dark-hooks state.
|
||||
case "${OUT}" in
|
||||
*'PLAN TAMPERED'*)
|
||||
*'===BEGIN-PWF-DATA'*)
|
||||
BYTES="$(printf '%s' "${OUT}" | wc -c | tr -d '[:space:]')"
|
||||
ok "injection: emits plan context (${BYTES} bytes)"
|
||||
;;
|
||||
*'[PLAN TAMPERED'*)
|
||||
warn "injection: plan is attested but the hash mismatches — run /plan-attest (or scripts/attest-plan.sh) to re-approve the current plan"
|
||||
;;
|
||||
*'requires attested plan'*)
|
||||
warn "injection: v3 mode without attestation — run attest-plan once to arm injection"
|
||||
;;
|
||||
*'Session isolation is armed'*)
|
||||
# Refusal notice, not plan context: reporting its byte count as
|
||||
# PASS told a dark user their hooks were fine.
|
||||
warn "injection: session isolation refuses this session — attach it with PWF_SESSION_ID=<id> plus .planning/sessions/<id>.attached, or delete the .planning/sessions/ dir (stale ones survive earlier Codex use and copied project trees) to turn isolation off"
|
||||
;;
|
||||
*'Ambiguous plan'*)
|
||||
warn "injection: nested-plan ambiguity — a project directly below this cwd carries its own plan, so hooks refuse to guess. Pin the thread with PWF_PLAN_ROOT=<absolute project root> or PLAN_ID=<slug>"
|
||||
;;
|
||||
*'PWF_PLAN_ROOT is not a directory'*)
|
||||
warn "injection: PWF_PLAN_ROOT points at a missing directory — fix or unset the pin; a broken pin fails closed and injects nothing"
|
||||
*'PWF_PLAN_ROOT is not a supported absolute local directory'*)
|
||||
warn "injection: PWF_PLAN_ROOT points at something that is not an absolute local directory — fix or unset the pin; a broken pin fails closed and injects nothing"
|
||||
;;
|
||||
*'PLAN_ID does not name a plan directory'*)
|
||||
warn "injection: PLAN_ID names no plan directory under .planning — fix or unset the pin; a set PLAN_ID is a binding and fails closed rather than selecting another plan"
|
||||
;;
|
||||
*)
|
||||
BYTES="$(printf '%s' "${OUT}" | wc -c | tr -d '[:space:]')"
|
||||
ok "injection: emits plan context (${BYTES} bytes)"
|
||||
warn "injection: inject-plan.sh emitted ${BYTES} bytes but no ===BEGIN-PWF-DATA frame, so no plan context reached the model. This is a refusal notice this doctor does not recognize; read it directly with: sh scripts/inject-plan.sh --context=userprompt"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
@@ -130,6 +130,13 @@ function Test-WithinRoot {
|
||||
|
||||
$activeFile = Join-Path $PlanRoot ".active_plan"
|
||||
|
||||
# A set PLAN_ID is a BINDING, not a hint (issue #237). A selector that names
|
||||
# no directory, fails slug validation, or fails containment terminates
|
||||
# resolution instead of falling through to .active_plan and newest-by-mtime:
|
||||
# the fall-through let a one-character typo attest and inject a DIFFERENT plan
|
||||
# at rc=0. Emptiness is the fail-closed signal on this channel, matching
|
||||
# resolve-plan-dir.sh and the PWF_PLAN_ROOT pin. An empty $env:PLAN_ID is
|
||||
# falsy here and still means "unset".
|
||||
if ($env:PLAN_ID) {
|
||||
if (Test-ValidSlug $env:PLAN_ID) {
|
||||
$candidate = Join-Path $PlanRoot $env:PLAN_ID
|
||||
@@ -138,16 +145,20 @@ if ($env:PLAN_ID) {
|
||||
exit 0
|
||||
}
|
||||
}
|
||||
exit 0
|
||||
}
|
||||
|
||||
if (Test-Path -LiteralPath $activeFile) {
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not $activeItem.PSIsContainer -and
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) {
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
} else {
|
||||
$planId = $null
|
||||
# Get-Item observes the link object even when its target is missing, unlike
|
||||
# Test-Path which follows the target. An active pointer that is a directory or
|
||||
# reparse point is an unsafe/ambiguous selector and must terminate resolution;
|
||||
# falling through would silently select and expose the newest unrelated plan.
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem) {
|
||||
if ($activeItem.PSIsContainer -or
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0)) {
|
||||
exit 0
|
||||
}
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
if ($planId -and (Test-ValidSlug $planId)) {
|
||||
$candidate = Join-Path $PlanRoot $planId
|
||||
if ((Test-Path $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
|
||||
|
||||
@@ -90,10 +90,54 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
@@ -105,12 +149,9 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -180,7 +221,8 @@ is_within_root() {
|
||||
}
|
||||
|
||||
# Portable mtime resolver. Tries GNU stat, BSD stat, BSD/macOS date -r,
|
||||
# python3, then perl. Returns "0" on full miss so callers can sort.
|
||||
# then an explicitly trusted Python interpreter. Returns "0" on a full miss
|
||||
# so newest-plan selection fails closed instead of executing from PATH.
|
||||
mtime_of() {
|
||||
target="$1"
|
||||
out="$(stat -c '%Y' "${target}" 2>/dev/null)"
|
||||
@@ -189,16 +231,9 @@ mtime_of() {
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
out="$(date -r "${target}" +%s 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
out="$(perl -e 'print((stat shift)[9])' "${target}" 2>/dev/null)"
|
||||
_mtime_python="$(trusted_python)" || _mtime_python=""
|
||||
if [ -n "${_mtime_python}" ]; then
|
||||
out="$("${_mtime_python}" -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
printf "0\n"
|
||||
@@ -262,7 +297,34 @@ resolve_latest_dir() {
|
||||
return 1
|
||||
}
|
||||
|
||||
if resolve_from_env; then exit 0; fi
|
||||
# A set PLAN_ID is a BINDING, not a hint (issue #237).
|
||||
#
|
||||
# resolve_from_env returns 1 both when no selector was set and when the
|
||||
# selector was rejected, so continuing the chain after it turned a
|
||||
# one-character typo into a silent switch: .active_plan or newest-by-mtime
|
||||
# answered instead, attest-plan.sh locked THAT plan at rc=0, and injection
|
||||
# followed the attestation onto it. commands/plan-attest.md already promised
|
||||
# the opposite ("It never falls back to another plan").
|
||||
#
|
||||
# Any non-empty PLAN_ID therefore terminates resolution here, whether it was
|
||||
# rejected for slug shape (traversal), for naming no directory, or for failing
|
||||
# containment. The caller receives an empty result and takes its own
|
||||
# fail-closed path rather than a different plan. PWF_PLAN_ROOT, the sibling
|
||||
# selector, has failed closed on any bad value since #212; the two selectors
|
||||
# now agree.
|
||||
#
|
||||
# An EMPTY PLAN_ID still means "unset": init-session.sh passes
|
||||
# PLAN_ID="${PLAN_ID:-}" into attest-plan.sh on the legacy path and depends on
|
||||
# that spelling resolving the root plan.
|
||||
#
|
||||
# Exit status stays 0 on the refusal (see the header contract). Emptiness is
|
||||
# the fail-closed signal on this channel, exactly as the PWF_PLAN_ROOT guard
|
||||
# above already does it; a non-zero status would kill callers running under
|
||||
# set -e for a condition that is not an internal error.
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
resolve_from_env && exit 0
|
||||
exit 0
|
||||
fi
|
||||
if resolve_from_active_file; then exit 0; fi
|
||||
if resolve_latest_dir; then exit 0; fi
|
||||
exit 0
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "planning-with-files",
|
||||
"version": "3.12.0",
|
||||
"version": "3.16.0",
|
||||
"description": "Persistent project planning for Codex. Opt-in lifecycle hooks inject selected plan context; automatic recovery uses project files only. Explicit catchup modes may read same-project local session records to emit aggregate counts or bounded nonce-framed excerpts. Optional gated mode can request continuation on capable hosts and never runs Markdown-declared commands. No network upload path.",
|
||||
"author": {
|
||||
"name": "OthmanAdi",
|
||||
|
||||
+1
-1
@@ -50,7 +50,7 @@
|
||||
],
|
||||
"PostToolUse": [
|
||||
{
|
||||
"matcher": "Bash|apply_patch|Edit|Write",
|
||||
"matcher": "apply_patch|Edit|Write",
|
||||
"hooks": [
|
||||
{
|
||||
"type": "command",
|
||||
|
||||
@@ -15,6 +15,11 @@ from typing import Any
|
||||
|
||||
HOOK_DIR = Path(__file__).resolve().parent
|
||||
_SAFE_LEGACY_SESSION_ID = re.compile(r"[A-Za-z0-9][A-Za-z0-9._-]{0,127}\Z")
|
||||
_DARWIN_SYSTEM_ALIASES = {
|
||||
Path("/var"): Path("/private/var"),
|
||||
Path("/tmp"): Path("/private/tmp"),
|
||||
Path("/etc"): Path("/private/etc"),
|
||||
}
|
||||
|
||||
|
||||
def load_payload() -> dict[str, Any]:
|
||||
@@ -80,13 +85,40 @@ def _is_reparse_or_link(path: Path) -> bool:
|
||||
return bool(attrs & reparse)
|
||||
|
||||
|
||||
def _is_trusted_darwin_system_alias(path: Path) -> bool:
|
||||
"""Admit only macOS's fixed root aliases after verifying their targets."""
|
||||
if sys.platform != "darwin":
|
||||
return False
|
||||
absolute = Path(os.path.abspath(path))
|
||||
expected = _DARWIN_SYSTEM_ALIASES.get(absolute)
|
||||
if expected is None:
|
||||
return False
|
||||
try:
|
||||
info = absolute.lstat()
|
||||
if not stat.S_ISLNK(info.st_mode):
|
||||
return False
|
||||
link_target = Path(os.readlink(absolute))
|
||||
if not link_target.is_absolute():
|
||||
link_target = absolute.parent / link_target
|
||||
if Path(os.path.normpath(link_target)) != expected:
|
||||
return False
|
||||
if Path(os.path.realpath(absolute)) != expected:
|
||||
return False
|
||||
target_info = expected.lstat()
|
||||
except (OSError, RuntimeError):
|
||||
return False
|
||||
return stat.S_ISDIR(target_info.st_mode) and not _is_reparse_or_link(expected)
|
||||
|
||||
|
||||
def _has_reparse_component(path: Path) -> bool:
|
||||
absolute = Path(os.path.abspath(path))
|
||||
current = Path(absolute.anchor)
|
||||
try:
|
||||
for part in absolute.parts[1:]:
|
||||
current /= part
|
||||
if _is_reparse_or_link(current):
|
||||
if _is_reparse_or_link(current) and not _is_trusted_darwin_system_alias(
|
||||
current
|
||||
):
|
||||
return True
|
||||
except (OSError, RuntimeError):
|
||||
return True
|
||||
|
||||
@@ -21,6 +21,11 @@ _WALL_CLOCK_UTC = re.compile(rb"T[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]+)?Z")
|
||||
_WALL_CLOCK_OFFSET = re.compile(
|
||||
rb"T[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]+)?([+-][0-9]{2}:[0-9]{2})"
|
||||
)
|
||||
_DARWIN_SYSTEM_ALIASES = {
|
||||
Path("/var"): Path("/private/var"),
|
||||
Path("/tmp"): Path("/private/tmp"),
|
||||
Path("/etc"): Path("/private/etc"),
|
||||
}
|
||||
|
||||
for _stream in (sys.stdout, sys.stderr):
|
||||
_reconfigure = getattr(_stream, "reconfigure", None)
|
||||
@@ -38,13 +43,37 @@ def _is_reparse_or_link_stat(info: os.stat_result) -> bool:
|
||||
return bool(attrs & getattr(stat, "FILE_ATTRIBUTE_REPARSE_POINT", 0x400))
|
||||
|
||||
|
||||
def _is_trusted_darwin_system_alias(path: Path, info: os.stat_result) -> bool:
|
||||
"""Admit only macOS's fixed root aliases after verifying their targets."""
|
||||
if sys.platform != "darwin" or not stat.S_ISLNK(info.st_mode):
|
||||
return False
|
||||
absolute = Path(os.path.abspath(path))
|
||||
expected = _DARWIN_SYSTEM_ALIASES.get(absolute)
|
||||
if expected is None:
|
||||
return False
|
||||
try:
|
||||
link_target = Path(os.readlink(absolute))
|
||||
if not link_target.is_absolute():
|
||||
link_target = absolute.parent / link_target
|
||||
if Path(os.path.normpath(link_target)) != expected:
|
||||
return False
|
||||
if Path(os.path.realpath(absolute)) != expected:
|
||||
return False
|
||||
target_info = expected.lstat()
|
||||
except (OSError, RuntimeError):
|
||||
return False
|
||||
return stat.S_ISDIR(target_info.st_mode) and not _is_reparse_or_link_stat(target_info)
|
||||
|
||||
|
||||
def _assert_no_reparse_components(path: Path) -> Path:
|
||||
absolute = Path(os.path.abspath(path))
|
||||
current = Path(absolute.anchor)
|
||||
for part in absolute.parts[1:]:
|
||||
current /= part
|
||||
info = current.lstat()
|
||||
if _is_reparse_or_link_stat(info):
|
||||
if _is_reparse_or_link_stat(info) and not _is_trusted_darwin_system_alias(
|
||||
current, info
|
||||
):
|
||||
raise ValueError("refusing symlink or reparse-point context path")
|
||||
return absolute
|
||||
|
||||
|
||||
@@ -6,9 +6,51 @@
|
||||
|
||||
HOOK_DIR="$(cd "$(dirname "$0")" 2>/dev/null && pwd)"
|
||||
PLAN_DIR="$(sh "${HOOK_DIR}/resolve-plan-dir.sh" 2>/dev/null)"
|
||||
# An explicit PLAN_ID is a binding, not a hint (issue #237). When the shared
|
||||
# resolver rejected one it emits nothing, and the legacy-root fallback below
|
||||
# would answer for a plan the operator never named. Stay silent instead; the
|
||||
# once-per-turn user-prompt-submit hook carries the notice.
|
||||
[ -z "$PLAN_DIR" ] && [ -n "${PLAN_ID:-}" ] && exit 0
|
||||
PLAN_FILE="${PLAN_DIR:+${PLAN_DIR}/}task_plan.md"
|
||||
|
||||
if [ -f "$PLAN_FILE" ]; then
|
||||
echo "[planning-with-files] Update progress.md with what you just did. If a phase is now complete, update task_plan.md status."
|
||||
[ -f "$PLAN_FILE" ] || exit 0
|
||||
|
||||
# --- Once-per-turn throttle (issue #239). ---
|
||||
# The reminder is a constant string, so every repeat after the first in a turn
|
||||
# carries no information: it names no tool, no file and no phase. The Codex
|
||||
# matcher fired on every shell command, so a session running twenty of them got
|
||||
# twenty identical lines. user-prompt-submit.sh fires once per turn and clears
|
||||
# this marker; the first post-tool fire of the turn sets it.
|
||||
#
|
||||
# The marker lives in the user's private cache, never in the plan directory:
|
||||
# that directory is shared project state. Cache root and key derivation match
|
||||
# hooks/claude-hook.sh and the slots inject-plan.sh already uses, so the two
|
||||
# routes throttle the same way. When no cache root can be created the throttle
|
||||
# is skipped rather than the nudge suppressed, so a broken cache cannot
|
||||
# silently remove the reminder.
|
||||
if [ -n "${XDG_CACHE_HOME:-}" ]; then
|
||||
TURN_ROOT="${XDG_CACHE_HOME}/pwf-turn"
|
||||
elif [ -n "${HOME:-}" ]; then
|
||||
TURN_ROOT="${HOME}/.cache/pwf-turn"
|
||||
else
|
||||
TURN_ROOT="${TMPDIR:-/tmp}/pwf-turn"
|
||||
fi
|
||||
TURN_MARKER=""
|
||||
if mkdir -p "$TURN_ROOT" 2>/dev/null; then
|
||||
case "$PLAN_FILE" in
|
||||
/*|[A-Za-z]:*|\\\\*) TURN_KEY_SRC="$PLAN_FILE" ;;
|
||||
*) TURN_KEY_SRC="${PWD}/${PLAN_FILE}" ;;
|
||||
esac
|
||||
TURN_KEY_SRC="${TURN_KEY_SRC}|${PWF_SESSION_ID:-}"
|
||||
TURN_KEY=$(printf '%s' "$TURN_KEY_SRC" \
|
||||
| { sha256sum 2>/dev/null || shasum -a 256 2>/dev/null; } \
|
||||
| awk '{print $1}' | cut -c1-16)
|
||||
[ -n "$TURN_KEY" ] && TURN_MARKER="${TURN_ROOT}/${TURN_KEY}"
|
||||
fi
|
||||
if [ -n "$TURN_MARKER" ]; then
|
||||
[ -e "$TURN_MARKER" ] && exit 0
|
||||
: > "$TURN_MARKER" 2>/dev/null || :
|
||||
fi
|
||||
|
||||
echo "[planning-with-files] Update progress.md with what you just did. If a phase is now complete, update task_plan.md status."
|
||||
exit 0
|
||||
|
||||
@@ -15,7 +15,18 @@ def main() -> None:
|
||||
|
||||
stdout, _ = adapter.run_shell_script("post-tool-use.sh", root)
|
||||
if stdout:
|
||||
adapter.emit_json({"systemMessage": stdout})
|
||||
# The nudge is addressed to Claude, so it belongs in the model's
|
||||
# context, not in a systemMessage (issue #239). systemMessage is a
|
||||
# warning shown to the USER, so the instruction never reached the model
|
||||
# while the person saw it after every matching tool call.
|
||||
# pre_tool_use.py and run_sh.py already emit this shape for their own
|
||||
# events; this path had simply never been moved over.
|
||||
adapter.emit_json({
|
||||
"hookSpecificOutput": {
|
||||
"hookEventName": "PostToolUse",
|
||||
"additionalContext": stdout,
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
@@ -7,6 +7,11 @@
|
||||
|
||||
HOOK_DIR="$(cd "$(dirname "$0")" 2>/dev/null && pwd)"
|
||||
PLAN_DIR="$(sh "${HOOK_DIR}/resolve-plan-dir.sh" 2>/dev/null)"
|
||||
# An explicit PLAN_ID is a binding, not a hint (issue #237). When the shared
|
||||
# resolver rejected one it emits nothing, and the legacy-root fallback below
|
||||
# would carry the wrong plan through compaction, which is the one moment the
|
||||
# session cannot re-read it. Stay silent instead.
|
||||
[ -z "$PLAN_DIR" ] && [ -n "${PLAN_ID:-}" ] && exit 0
|
||||
PLAN_FILE="${PLAN_DIR:+${PLAN_DIR}/}task_plan.md"
|
||||
|
||||
if [ ! -f "$PLAN_FILE" ]; then
|
||||
|
||||
@@ -10,6 +10,11 @@ fi
|
||||
|
||||
HOOK_DIR="$(cd "$(dirname "$0")" 2>/dev/null && pwd)"
|
||||
PLAN_DIR="$(sh "${HOOK_DIR}/resolve-plan-dir.sh" 2>/dev/null)"
|
||||
# An explicit PLAN_ID is a binding, not a hint (issue #237). When the shared
|
||||
# resolver rejected one it emits nothing, and the legacy-root fallback below
|
||||
# would recite a plan the operator never named on every tool call. Stay silent
|
||||
# instead; the once-per-turn user-prompt-submit hook carries the notice.
|
||||
[ -z "$PLAN_DIR" ] && [ -n "${PLAN_ID:-}" ] && exit 0
|
||||
PLAN_FILE="${PLAN_DIR:+${PLAN_DIR}/}task_plan.md"
|
||||
|
||||
if [ -f "$PLAN_FILE" ]; then
|
||||
|
||||
@@ -6,6 +6,11 @@
|
||||
|
||||
HOOK_DIR="$(cd "$(dirname "$0")" 2>/dev/null && pwd)"
|
||||
PLAN_DIR="$(sh "${HOOK_DIR}/resolve-plan-dir.sh" 2>/dev/null)"
|
||||
# An explicit PLAN_ID is a binding, not a hint (issue #237). When the shared
|
||||
# resolver rejected one it emits nothing, and the legacy-root fallback below
|
||||
# would decide whether this run may stop from a plan the operator never named.
|
||||
# Allow the stop rather than gating on the wrong plan.
|
||||
[ -z "$PLAN_DIR" ] && [ -n "${PLAN_ID:-}" ] && exit 0
|
||||
PLAN_FILE="${PLAN_DIR:+${PLAN_DIR}/}task_plan.md"
|
||||
|
||||
if [ ! -f "$PLAN_FILE" ]; then
|
||||
|
||||
@@ -79,12 +79,52 @@ PLAN_DIR="$(sh "${HOOK_DIR}/resolve-plan-dir.sh" 2>/dev/null)"
|
||||
if [ -n "$PLAN_DIR" ]; then
|
||||
PLAN_FILE="${PLAN_DIR}/task_plan.md"
|
||||
PROGRESS_FILE="${PLAN_DIR}/progress.md"
|
||||
elif [ -n "${PLAN_ID:-}" ]; then
|
||||
# An explicit PLAN_ID is a binding, not a hint (issue #237). The shared
|
||||
# resolver rejected it, so the legacy-root fallback below would inject a
|
||||
# plan the operator never named. This hook fires once per turn, so one
|
||||
# diagnosable line is not spam and the alternative is a dark session with
|
||||
# no stated cause. Wording matches scripts/inject-plan.sh so all routes say
|
||||
# the same thing.
|
||||
echo "[planning-with-files] PLAN_ID does not name a plan directory under .planning: ${PLAN_ID} — nothing injected. Fix or unset the pin; a broken pin fails closed rather than selecting another plan."
|
||||
exit 0
|
||||
else
|
||||
PLAN_FILE="${PLAN_PREFIX}task_plan.md"
|
||||
PROGRESS_FILE="${PLAN_PREFIX}progress.md"
|
||||
fi
|
||||
[ -f "$PLAN_FILE" ] || exit 0
|
||||
|
||||
# --- Re-arm the once-per-turn PostToolUse nudge (issue #239). ---
|
||||
# One user message is one turn, and this hook fires once per turn, so clearing
|
||||
# the marker here is what makes the nudge appear once after the first write
|
||||
# instead of after every matching tool call.
|
||||
#
|
||||
# The key is computed from post-tool-use.sh's OWN plan-file expression, not
|
||||
# from $PLAN_FILE above. This hook resolves a PWF_PLAN_ROOT pin and that one
|
||||
# does not, so the two spellings diverge under a pin; keying off the shared
|
||||
# expression keeps both sides on one marker. A mismatch here would not be
|
||||
# loud: the marker would never be cleared and the nudge would fire once per
|
||||
# session instead of once per turn.
|
||||
TURN_PLAN_FILE="${PLAN_DIR:+${PLAN_DIR}/}task_plan.md"
|
||||
if [ -n "${XDG_CACHE_HOME:-}" ]; then
|
||||
TURN_ROOT="${XDG_CACHE_HOME}/pwf-turn"
|
||||
elif [ -n "${HOME:-}" ]; then
|
||||
TURN_ROOT="${HOME}/.cache/pwf-turn"
|
||||
else
|
||||
TURN_ROOT="${TMPDIR:-/tmp}/pwf-turn"
|
||||
fi
|
||||
if [ -d "$TURN_ROOT" ]; then
|
||||
case "$TURN_PLAN_FILE" in
|
||||
/*|[A-Za-z]:*|\\\\*) TURN_KEY_SRC="$TURN_PLAN_FILE" ;;
|
||||
*) TURN_KEY_SRC="${PWD}/${TURN_PLAN_FILE}" ;;
|
||||
esac
|
||||
TURN_KEY_SRC="${TURN_KEY_SRC}|${PWF_SESSION_ID:-}"
|
||||
TURN_KEY=$(printf '%s' "$TURN_KEY_SRC" \
|
||||
| { sha256sum 2>/dev/null || shasum -a 256 2>/dev/null; } \
|
||||
| awk '{print $1}' | cut -c1-16)
|
||||
[ -n "$TURN_KEY" ] && rm -f -- "${TURN_ROOT}/${TURN_KEY}" 2>/dev/null || :
|
||||
fi
|
||||
|
||||
# Session isolation: if .planning/sessions/ exists, only attached sessions see
|
||||
# plan context. Absence of the sessions dir means legacy single-session mode —
|
||||
# all sessions in the cwd receive context to preserve backward compatibility.
|
||||
|
||||
@@ -36,7 +36,7 @@ hooks:
|
||||
- type: command
|
||||
command: "SH=\"\"; for c in \"${PWF_SCRIPT_DIR}/inject-plan.sh\" \"${CLAUDE_SKILL_DIR}/scripts/inject-plan.sh\" \"$HOME/.codex/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/inject-plan.sh\"; do [ -f \"$c\" ] && { SH=\"$c\"; break; }; done; [ -n \"$SH\" ] && sh \"$SH\" --context=precompact; exit 0"
|
||||
metadata:
|
||||
version: "3.12.0"
|
||||
version: "3.16.0"
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -32,6 +32,9 @@ param(
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
if (-not $script:IsWindowsHost) {
|
||||
throw "Safe no-follow descriptor operations are unavailable in this PowerShell script on Unix. Use scripts/attest-plan.sh instead."
|
||||
}
|
||||
if ($script:IsWindowsHost -and -not ("PwfAttestationNative" -as [type])) {
|
||||
Add-Type -TypeDefinition @'
|
||||
using System;
|
||||
@@ -382,6 +385,21 @@ function Resolve-ContainedPlanFile {
|
||||
} catch { return $null }
|
||||
}
|
||||
|
||||
function Test-SlugPlanDirectory {
|
||||
param([string] $Directory)
|
||||
try {
|
||||
$finalDirectory = [PwfAttestationNative]::FinalDirectoryPath($Directory)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
$planningDirectory = Split-Path -Parent $finalDirectory
|
||||
$planId = Split-Path -Leaf $finalDirectory
|
||||
return (
|
||||
(Split-Path -Leaf $planningDirectory) -eq ".planning" -and
|
||||
$planId -match '^[A-Za-z0-9_][A-Za-z0-9._-]*$'
|
||||
)
|
||||
}
|
||||
|
||||
function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
@@ -395,10 +413,17 @@ function Resolve-PlanFile {
|
||||
# fall through and attest an unrelated legacy-root plan.
|
||||
if ($env:PWF_PLAN_ROOT -or $env:PLAN_ID) { return $null }
|
||||
$activePointer = Join-Path (Join-Path (Get-Location) ".planning") ".active_plan"
|
||||
if (Test-Path -LiteralPath $activePointer) { return $null }
|
||||
$activePointerItem = Get-Item -LiteralPath $activePointer -Force -ErrorAction SilentlyContinue
|
||||
if ($activePointerItem) { return $null }
|
||||
|
||||
$legacy = Join-Path (Get-Location) "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory (Get-Location).Path)
|
||||
$currentDirectory = (Get-Location).Path
|
||||
if (Test-SlugPlanDirectory $currentDirectory) {
|
||||
$slugPlan = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $slugPlan -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
$legacy = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
function Get-AttestationPath {
|
||||
@@ -406,6 +431,9 @@ function Get-AttestationPath {
|
||||
$planDir = Split-Path -Parent $PlanFile
|
||||
$cwd = (Get-Location).Path
|
||||
if ($planDir -eq $cwd) {
|
||||
if (Test-SlugPlanDirectory $cwd) {
|
||||
return (Join-Path $cwd ".attestation")
|
||||
}
|
||||
return (Join-Path $cwd ".plan-attestation")
|
||||
}
|
||||
return (Join-Path $planDir ".attestation")
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
# 1. $PLAN_ID env var → ./.planning/$PLAN_ID/
|
||||
# 2. ./.planning/.active_plan
|
||||
# 3. Newest ./.planning/<dir>/ by mtime
|
||||
# 4. Legacy ./task_plan.md at project root
|
||||
# 4. Current directory when it is .planning/<valid-slug>/
|
||||
# 5. Legacy ./task_plan.md at project root
|
||||
#
|
||||
# Usage:
|
||||
# sh scripts/attest-plan.sh # attest the active plan
|
||||
@@ -21,6 +22,25 @@ set -u
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
RESOLVER="${SCRIPT_DIR}/resolve-plan-dir.sh"
|
||||
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
resolve_from_slug_cwd() {
|
||||
slug_cwd="$(pwd -P 2>/dev/null)" || return 1
|
||||
planning_dir="${slug_cwd%/*}"
|
||||
[ "${planning_dir##*/}" = ".planning" ] || return 1
|
||||
plan_id="${slug_cwd##*/}"
|
||||
slug_is_valid "${plan_id}" || return 1
|
||||
[ -f "${slug_cwd}/task_plan.md" ] || return 1
|
||||
printf "%s\n" "${slug_cwd}/task_plan.md"
|
||||
}
|
||||
|
||||
resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
@@ -30,6 +50,22 @@ resolve_plan_file() {
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Explicit selectors are bindings, not hints. If the shared resolver
|
||||
# rejected one, do not attest a different plan through a cwd fallback.
|
||||
if [ -n "${PWF_PLAN_ROOT:-}" ] || [ -n "${PLAN_ID:-}" ]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
# An absolute script path does not change the invoking shell's cwd. When
|
||||
# that cwd is a slug plan directory, keep slug-mode storage semantics
|
||||
# instead of misclassifying its task_plan.md as a legacy root plan.
|
||||
slug_plan_file="$(resolve_from_slug_cwd)" || slug_plan_file=""
|
||||
if [ -n "${slug_plan_file}" ]; then
|
||||
printf "%s\n" "${slug_plan_file}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "./task_plan.md" ]; then
|
||||
printf "%s\n" "./task_plan.md"
|
||||
return 0
|
||||
@@ -72,7 +108,18 @@ case "${1:-}" in
|
||||
esac
|
||||
|
||||
plan_file="$(resolve_plan_file)" || {
|
||||
printf "[plan-attest] No task_plan.md found. Create a plan first.\n" >&2
|
||||
# Name the actual cause. "No task_plan.md found" is true but misleading
|
||||
# when the plan exists and an explicit selector was rejected: before #237
|
||||
# a mistyped PLAN_ID attested a DIFFERENT plan at rc=0, and an operator
|
||||
# who now sees a generic not-found is likely to go looking for the wrong
|
||||
# problem. The selectors are bindings, so say which one refused.
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
printf "[plan-attest] PLAN_ID=%s names no plan directory under .planning. An explicit selector is a binding: nothing was attested and no other plan was substituted.\n" "${PLAN_ID}" >&2
|
||||
elif [ -n "${PWF_PLAN_ROOT:-}" ]; then
|
||||
printf "[plan-attest] PWF_PLAN_ROOT=%s did not resolve to a project root holding a plan. An explicit pin is a binding: nothing was attested and no other plan was substituted.\n" "${PWF_PLAN_ROOT}" >&2
|
||||
else
|
||||
printf "[plan-attest] No task_plan.md found. Create a plan first.\n" >&2
|
||||
fi
|
||||
exit 1
|
||||
}
|
||||
|
||||
|
||||
@@ -107,13 +107,27 @@ if (-not $Gate) {
|
||||
|
||||
# ---- Gate path (-Gate). Resolves to advisory unless every guard says block. ----
|
||||
|
||||
# Guard 1: gated mode. The .mode file must contain "gate".
|
||||
# Guard 1: gated mode. A .mode file must contain "gate".
|
||||
#
|
||||
# The project's root .mode is a FLOOR, not a default that slug scope replaces
|
||||
# (issue #238). Reading only <plan-dir>\.mode let a slug plan with no .mode
|
||||
# drop a project-committed gate. "gate" from EITHER file arms the gate; a slug
|
||||
# may raise strictness, never lower it. In root scope $PlanDir already IS the
|
||||
# project root, so the second source is skipped and behavior is unchanged.
|
||||
$modeFile = Join-Path $PlanDir ".mode"
|
||||
$rootForMode = if ($env:PWF_PLAN_ROOT) { $env:PWF_PLAN_ROOT } else { "." }
|
||||
$rootModeFile = $null
|
||||
if ($PlanDir -ne $rootForMode -and $PlanDir -ne ".") {
|
||||
$rootModeFile = Join-Path $rootForMode ".mode"
|
||||
}
|
||||
$gatedMode = $false
|
||||
if (Test-Path $modeFile) {
|
||||
$modeContent = Get-Content $modeFile -Raw -ErrorAction SilentlyContinue
|
||||
foreach ($candidateMode in @($modeFile, $rootModeFile)) {
|
||||
if (-not $candidateMode) { continue }
|
||||
if (-not (Test-Path $candidateMode)) { continue }
|
||||
$modeContent = Get-Content $candidateMode -Raw -ErrorAction SilentlyContinue
|
||||
if ($null -ne $modeContent -and $modeContent -match "gate") {
|
||||
$gatedMode = $true
|
||||
break
|
||||
}
|
||||
}
|
||||
if (-not $gatedMode) {
|
||||
|
||||
@@ -60,6 +60,14 @@ else
|
||||
if [ -n "${RESOLVED_DIR}" ] && [ -f "${RESOLVED_DIR}/task_plan.md" ]; then
|
||||
PLAN_FILE="${RESOLVED_DIR}/task_plan.md"
|
||||
PLAN_DIR="${RESOLVED_DIR}"
|
||||
elif [ -n "${PLAN_ID:-}" ] || [ -n "${PWF_PLAN_ROOT:-}" ]; then
|
||||
# Explicit selectors are bindings, not hints (issue #237). The shared
|
||||
# resolver rejected one, so the legacy cwd fallback below must not run:
|
||||
# answering a mistyped pin with the ROOT plan's completion state is the
|
||||
# same wrong-plan harm the binding removes, and here it would decide
|
||||
# whether an autonomous run is allowed to stop.
|
||||
echo "[planning-with-files] An explicit PLAN_ID or PWF_PLAN_ROOT did not resolve to a plan; no completion state was read and no other plan was substituted."
|
||||
exit 0
|
||||
else
|
||||
PLAN_FILE="task_plan.md"
|
||||
PLAN_DIR="."
|
||||
@@ -131,10 +139,30 @@ fi
|
||||
|
||||
# ---- Gate path (--gate). Resolves to advisory unless every guard says block. ----
|
||||
|
||||
# Guard 1: gated mode. The .mode file must contain "gate". Absent or other
|
||||
# Guard 1: gated mode. A .mode file must contain "gate". Absent or other
|
||||
# content means advisory mode (legacy behavior preserved).
|
||||
#
|
||||
# The project's root .mode is a FLOOR, not a default that slug scope replaces
|
||||
# (issue #238). Reading only <plan-dir>/.mode let a slug plan with no .mode
|
||||
# drop a project-committed gate, the same way it dropped the attestation
|
||||
# requirement in inject-plan.sh. "gate" from EITHER file arms the gate; a slug
|
||||
# may raise strictness, never lower it. In root scope PLAN_DIR already IS the
|
||||
# project root, so the second source stays empty and behavior is unchanged.
|
||||
MODE_FILE="${PLAN_DIR}/.mode"
|
||||
if [ ! -f "${MODE_FILE}" ] || ! grep -q "gate" "${MODE_FILE}" 2>/dev/null; then
|
||||
ROOT_MODE_FILE=""
|
||||
_root_for_mode="${PWF_PLAN_ROOT:-.}"
|
||||
if [ "${PLAN_DIR}" != "${_root_for_mode}" ] && [ "${PLAN_DIR}" != "." ]; then
|
||||
ROOT_MODE_FILE="${_root_for_mode}/.mode"
|
||||
fi
|
||||
GATED=0
|
||||
if [ -f "${MODE_FILE}" ] && grep -q "gate" "${MODE_FILE}" 2>/dev/null; then
|
||||
GATED=1
|
||||
fi
|
||||
if [ "${GATED}" -eq 0 ] && [ -n "${ROOT_MODE_FILE}" ] && [ -f "${ROOT_MODE_FILE}" ] \
|
||||
&& grep -q "gate" "${ROOT_MODE_FILE}" 2>/dev/null; then
|
||||
GATED=1
|
||||
fi
|
||||
if [ "${GATED}" -eq 0 ]; then
|
||||
advisory_report
|
||||
exit 0
|
||||
fi
|
||||
|
||||
@@ -152,6 +152,33 @@ gen_nonce() {
|
||||
# $1 = plan dir (absolute or relative); dotfiles live directly inside it.
|
||||
# $2 = plan file path (task_plan.md) used for auto-attestation resolution.
|
||||
# No-op when MODE is empty (legacy path stays byte-equivalent to v2.43.0).
|
||||
# Raise MODE to the project's committed floor before the side effects run
|
||||
# (issue #238). A project that ships a root .mode has made that setting a
|
||||
# reviewed part of the repo; a new slug plan must not start below it. Without
|
||||
# this, `init-session.sh <name>` created a plan with no .mode at all, and the
|
||||
# project's attestation requirement became a flag the agent chose at plan
|
||||
# creation time.
|
||||
#
|
||||
# inject-plan.sh enforces the same floor at read time, so this is not the
|
||||
# guard. It exists so the effective policy is VISIBLE in the plan directory
|
||||
# rather than only inside the resolver, and so the new plan gets the nonce and
|
||||
# the auto-attestation that autonomous mode needs to inject at all.
|
||||
#
|
||||
# An explicit --autonomous/--gated is never lowered: gated stays gated.
|
||||
inherit_root_mode() {
|
||||
_root_mode="${PWD}/.mode"
|
||||
[ -f "${_root_mode}" ] || return 0
|
||||
[ "$MODE" = "gated" ] && return 0
|
||||
if grep -q 'gate' "${_root_mode}" 2>/dev/null; then
|
||||
MODE='gated'
|
||||
return 0
|
||||
fi
|
||||
if grep -q 'autonomous' "${_root_mode}" 2>/dev/null; then
|
||||
MODE='autonomous'
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
apply_v3_mode() {
|
||||
_mode_dir="$1"
|
||||
_mode_plan="$2"
|
||||
@@ -367,6 +394,7 @@ if [ "$SLUG_MODE" -eq 1 ]; then
|
||||
echo "PLAN_ID=$PLAN_ID"
|
||||
create_files_in "$PLAN_DIR"
|
||||
printf "%s\n" "$PLAN_ID" > "${PLAN_ROOT}/.active_plan"
|
||||
inherit_root_mode
|
||||
apply_v3_mode "$PLAN_DIR" "${PLAN_DIR}/task_plan.md"
|
||||
echo ""
|
||||
echo "Active plan recorded: ${PLAN_ROOT}/.active_plan"
|
||||
|
||||
@@ -27,27 +27,26 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Select a working interpreter, not merely the first executable name on PATH.
|
||||
# Validate candidate interpreters supplied by the selector wrappers below.
|
||||
# Windows Store app aliases can exist as python3.exe while refusing every
|
||||
# script invocation. Probe candidates privately and fail closed if none runs.
|
||||
select_python() {
|
||||
# PWF_TRUSTED_PYTHON is the explicit trust path. PYTHON_BIN remains a
|
||||
# compatibility alias. PATH discovery is a deliberate fallback: the hook
|
||||
# treats the caller's PATH as executable trust, but still requires the
|
||||
# resolved candidate to be an absolute regular executable.
|
||||
for _sp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}" "$(command -v python3 2>/dev/null)" "$(command -v python 2>/dev/null)"; do
|
||||
select_python_candidates() {
|
||||
for _sp_candidate in "$@"; do
|
||||
[ -n "$_sp_candidate" ] || continue
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
case "$_sp_candidate" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
# Git Bash cannot reliably test or invoke C:\... spelling.
|
||||
# Convert before every filesystem predicate and invocation.
|
||||
command -v cygpath >/dev/null 2>&1 || continue
|
||||
_sp_candidate="$(cygpath -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
# Convert with Git Bash's fixed system helper, never PATH.
|
||||
_sp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "$_sp_cygpath" ] && [ -x "$_sp_cygpath" ] || continue
|
||||
_sp_candidate="$("$_sp_cygpath" -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
[ -f "$_sp_candidate" ] || continue
|
||||
[ -x "$_sp_candidate" ] || continue
|
||||
if "$_sp_candidate" -c 'import sys; raise SystemExit(0 if sys.version_info >= (3, 8) else 1)' >/dev/null 2>&1; then
|
||||
@@ -58,6 +57,21 @@ select_python() {
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment may use only an interpreter path the caller explicitly trusted.
|
||||
select_explicit_python() {
|
||||
select_python_candidates "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"
|
||||
}
|
||||
|
||||
# After containment succeeds, PATH discovery remains a compatibility fallback
|
||||
# for hosts that do not export an interpreter path to direct hook invocations.
|
||||
select_python() {
|
||||
select_python_candidates \
|
||||
"${PWF_TRUSTED_PYTHON:-}" \
|
||||
"${PYTHON_BIN:-}" \
|
||||
"$(command -v python3 2>/dev/null)" \
|
||||
"$(command -v python 2>/dev/null)"
|
||||
}
|
||||
|
||||
# issue #195: per-invocation opt-out (PLANNING_DISABLED=1) for one-shot/CI
|
||||
# sessions that share a cwd with a plan but never opted into it.
|
||||
[ "${PLANNING_DISABLED:-}" = "1" ] && exit 0
|
||||
@@ -154,13 +168,24 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
# (Copied verbatim from resolve-plan-dir.sh so hook injection gets the same
|
||||
# symlink containment as the resolver — see security A1.3.)
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Matching is case-insensitive and works after slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils), then
|
||||
# readlink -f (older GNU), then the interpreter already validated by
|
||||
# select_python(). Prints the canonical absolute path on success; prints
|
||||
# nothing and returns 1 on a full miss so the caller can decide what to do.
|
||||
# The fallback must not rediscover or execute an unvalidated PATH interpreter.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
@@ -171,12 +196,8 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
if [ -n "${PWF_PYTHON:-}" ]; then
|
||||
out="$("${PWF_PYTHON}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -233,8 +254,28 @@ SCOPE=""
|
||||
EXPLICIT=0
|
||||
[ -n "$PLAN_PREFIX" ] && EXPLICIT=1
|
||||
[ "$SESSION_ATTACHED" = "1" ] && EXPLICIT=1
|
||||
if [ -n "${PLAN_ID:-}" ] && slug_is_valid "$PLAN_ID" && [ -d "${PLAN_PREFIX}.planning/${PLAN_ID}" ]; then
|
||||
RESOLVED="${PLAN_PREFIX}.planning/${PLAN_ID}"; SCOPE="scoped"; EXPLICIT=1
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
# A set PLAN_ID is a BINDING, not a hint (issue #237). This inline resolver
|
||||
# is the one the hooks actually run, so it carries the same rule as
|
||||
# resolve-plan-dir.sh: a selector that names no directory, fails slug
|
||||
# validation, or fails containment refuses instead of falling through to
|
||||
# .active_plan and newest-by-mtime. The fall-through is what let a
|
||||
# one-character typo inject a DIFFERENT plan while attest-plan.sh locked
|
||||
# that same wrong plan at rc=0.
|
||||
#
|
||||
# Unlike the PWF_PLAN_ROOT refusal above, the notice is userprompt-only.
|
||||
# pretool fires per tool call and precompact carries no plan body, so
|
||||
# printing on those would spam the transcript with the same line. The
|
||||
# userprompt fire is also the one plan-doctor.sh drives, so /plan-doctor
|
||||
# still sees and reports the state.
|
||||
if slug_is_valid "$PLAN_ID" && [ -d "${PLAN_PREFIX}.planning/${PLAN_ID}" ]; then
|
||||
RESOLVED="${PLAN_PREFIX}.planning/${PLAN_ID}"; SCOPE="scoped"; EXPLICIT=1
|
||||
else
|
||||
if [ "$CONTEXT" = "userprompt" ]; then
|
||||
echo "[planning-with-files] PLAN_ID does not name a plan directory under .planning: ${PLAN_ID} — nothing injected. Fix or unset the pin; a broken pin fails closed rather than selecting another plan."
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
elif [ -f "${PLAN_PREFIX}.planning/.active_plan" ]; then
|
||||
AP=$(tr -d '\r\n[:space:]' < "${PLAN_PREFIX}.planning/.active_plan" 2>/dev/null)
|
||||
if [ -n "$AP" ] && slug_is_valid "$AP" && [ -d "${PLAN_PREFIX}.planning/${AP}" ]; then
|
||||
@@ -256,9 +297,9 @@ fi
|
||||
if [ -z "$RESOLVED" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; then RESOLVED="${PLAN_PREFIX}."; SCOPE="root"; fi
|
||||
[ -z "$RESOLVED" ] && exit 0
|
||||
|
||||
# Do not probe or execute any interpreter until a real, contained plan exists.
|
||||
# This keeps opt-out and no-plan hook fires side-effect free even when an
|
||||
# untrusted PYTHON_BIN or PATH entry points at an executable canary.
|
||||
# Do not probe or execute any interpreter until a real plan exists. Before
|
||||
# containment, only an explicit PWF_TRUSTED_PYTHON or PYTHON_BIN may be used.
|
||||
# PATH discovery remains deferred until containment succeeds.
|
||||
if [ "$SCOPE" = "root" ]; then
|
||||
PRECHECK_PLAN_FILE="${PLAN_PREFIX}task_plan.md"
|
||||
else
|
||||
@@ -266,8 +307,9 @@ else
|
||||
fi
|
||||
[ -f "$PRECHECK_PLAN_FILE" ] || exit 0
|
||||
[ -L "$PRECHECK_PLAN_FILE" ] && exit 0
|
||||
PWF_PYTHON="$(select_explicit_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
is_within_root "$PRECHECK_PLAN_FILE" || exit 0
|
||||
PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
[ -n "$PWF_PYTHON" ] || PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
|
||||
# Session attachment is evaluated only after plan existence is proven. A
|
||||
# stale sessions directory without any plan must not cause interpreter probes.
|
||||
@@ -454,12 +496,16 @@ if [ "$SCOPE" = "root" ]; then
|
||||
PROGRESS_FILE="${PLAN_PREFIX}progress.md"
|
||||
ATTEST_FILE="${PLAN_PREFIX}.plan-attestation"
|
||||
MODE_FILE="${PLAN_PREFIX}.mode"
|
||||
ROOT_MODE_FILE=""
|
||||
NONCE_FILE="${PLAN_PREFIX}.nonce"
|
||||
else
|
||||
PLAN_FILE="${RESOLVED}/task_plan.md"
|
||||
PROGRESS_FILE="${RESOLVED}/progress.md"
|
||||
ATTEST_FILE="${RESOLVED}/.attestation"
|
||||
MODE_FILE="${RESOLVED}/.mode"
|
||||
# The project's own .mode, when it has one (issue #238). In root scope
|
||||
# MODE_FILE already IS that file, so the second source stays empty.
|
||||
ROOT_MODE_FILE="${PLAN_PREFIX}.mode"
|
||||
NONCE_FILE="${RESOLVED}/.nonce"
|
||||
fi
|
||||
[ -f "$PLAN_FILE" ] || exit 0
|
||||
@@ -831,11 +877,52 @@ fi
|
||||
# gated mode to legacy behavior (platform-critical: per-tool-call injection not
|
||||
# suppressed, oracle re-hash skipped, raw progress tail injected). Use a grep
|
||||
# token test, the same pattern check-complete.sh guard 1 uses.
|
||||
|
||||
# --- Root .mode is a FLOOR, not a default that slug scope replaces (#238). ---
|
||||
# A project makes attestation mandatory by committing a root .mode, which is a
|
||||
# reviewed project setting. Slug scope used to read ONLY the slug's .mode, and
|
||||
# init-session.sh writes no .mode unless --autonomous or --gated was passed, so
|
||||
# `init-session.sh <name>` produced a plan with no mode, no attestation
|
||||
# requirement and full injection: one agent-invocable command turned the
|
||||
# project's policy off.
|
||||
#
|
||||
# mode_has answers for a strictness-RAISING token: present in EITHER file. A
|
||||
# slug may opt into autonomous/gated where the root left it unset; it can no
|
||||
# longer opt out of what the root committed.
|
||||
#
|
||||
# mode_relax_allowed answers for the one strictness-LOWERING token
|
||||
# (plan-guard-off): the slug must carry it AND, when the project committed a
|
||||
# root .mode, that file must carry it too. A slug alone cannot switch off a
|
||||
# protection the project kept on.
|
||||
#
|
||||
# With no root .mode present ROOT_MODE_FILE is either empty (root scope) or
|
||||
# names a missing file, so the effective token set is exactly the slug's and
|
||||
# existing projects are byte-identical.
|
||||
mode_has() {
|
||||
_mh_token="$1"
|
||||
if [ -f "$MODE_FILE" ] && grep -q "$_mh_token" "$MODE_FILE" 2>/dev/null; then
|
||||
return 0
|
||||
fi
|
||||
if [ -n "$ROOT_MODE_FILE" ] && [ -f "$ROOT_MODE_FILE" ] \
|
||||
&& grep -q "$_mh_token" "$ROOT_MODE_FILE" 2>/dev/null; then
|
||||
return 0
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
mode_relax_allowed() {
|
||||
_mr_token="$1"
|
||||
[ -f "$MODE_FILE" ] || return 1
|
||||
grep -q "$_mr_token" "$MODE_FILE" 2>/dev/null || return 1
|
||||
if [ -n "$ROOT_MODE_FILE" ] && [ -f "$ROOT_MODE_FILE" ]; then
|
||||
grep -q "$_mr_token" "$ROOT_MODE_FILE" 2>/dev/null || return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
MODE=""
|
||||
if [ -f "$MODE_FILE" ]; then
|
||||
grep -q 'autonomous' "$MODE_FILE" 2>/dev/null && MODE='autonomous'
|
||||
grep -q 'gate' "$MODE_FILE" 2>/dev/null && MODE='gated'
|
||||
fi
|
||||
mode_has 'autonomous' && MODE='autonomous'
|
||||
mode_has 'gate' && MODE='gated'
|
||||
|
||||
# In autonomous/gated mode the per-tool-call injection is dropped (recitation
|
||||
# policy): strong models do not need the plan re-recited before every tool call,
|
||||
@@ -859,7 +946,7 @@ fi
|
||||
SMART=0
|
||||
if [ "${PWF_INJECT:-}" = "smart" ]; then
|
||||
SMART=1
|
||||
elif [ -f "$MODE_FILE" ] && grep -q 'inject-smart' "$MODE_FILE" 2>/dev/null; then
|
||||
elif mode_has 'inject-smart'; then
|
||||
SMART=1
|
||||
fi
|
||||
|
||||
@@ -1127,7 +1214,7 @@ esac
|
||||
# holding the stale copy. Per-session keying needs PWF_SESSION_ID, which most
|
||||
# hosts never set.
|
||||
GUARD=1
|
||||
[ -f "$MODE_FILE" ] && grep -q 'plan-guard-off' "$MODE_FILE" 2>/dev/null && GUARD=0
|
||||
mode_relax_allowed 'plan-guard-off' && GUARD=0
|
||||
[ "${PWF_PLAN_GUARD:-}" = "0" ] && GUARD=0
|
||||
if [ "$GUARD" = "1" ]; then
|
||||
# Same user-private cache root and same absolute-path key as the attestation
|
||||
|
||||
@@ -68,6 +68,15 @@ if [ -n "${ARG_DIR}" ]; then
|
||||
elif [ -f "${RESOLVER}" ]; then
|
||||
PLAN_DIR="$(sh "${RESOLVER}" 2>/dev/null)"
|
||||
if [ -z "${PLAN_DIR}" ] || [ ! -d "${PLAN_DIR}" ]; then
|
||||
# Explicit selectors are bindings, not hints (issue #237). A rejected
|
||||
# PLAN_ID or PWF_PLAN_ROOT must not fall back to the cwd: this summary
|
||||
# is injected into autonomous turns, so reporting the ROOT plan's
|
||||
# phase counts under a mistyped pin feeds the loop another plan's
|
||||
# termination signal. Degrade loudly, the same way a missing resolver
|
||||
# already does.
|
||||
if [ -n "${PLAN_ID:-}" ] || [ -n "${PWF_PLAN_ROOT:-}" ]; then
|
||||
emit_unavailable "explicit PLAN_ID or PWF_PLAN_ROOT did not resolve"
|
||||
fi
|
||||
PLAN_DIR="."
|
||||
fi
|
||||
else
|
||||
|
||||
@@ -74,27 +74,49 @@ if [ -f "${INJ}" ]; then
|
||||
ok "injection: silent because no plan exists here (correct behavior)"
|
||||
fi
|
||||
else
|
||||
# Classify on the DATA FRAMING first, never on substrings of the whole
|
||||
# blob (issue #236). ${OUT} carries the plan body VERBATIM inside
|
||||
# ===BEGIN-PWF-DATA=== fences, so a bare substring test also matches
|
||||
# plan prose: a phase line reading "fix the false PLAN TAMPERED
|
||||
# warning" made the doctor report a hash mismatch on a correctly
|
||||
# attested plan.
|
||||
#
|
||||
# Every refusal path in inject-plan.sh prints its banner and exits
|
||||
# before frame_file runs, so a frame in the output proves injection
|
||||
# happened and rules out every refusal. Output WITHOUT a frame is by
|
||||
# construction a notice, which is why the banner arms sit under the
|
||||
# else side and the default arm warns instead of passing. A banner
|
||||
# whose wording drifts then degrades to a generic warning rather than
|
||||
# to a silent PASS: that is exactly how the stale
|
||||
# "PWF_PLAN_ROOT is not a directory" literal (which was never a
|
||||
# substring of what inject-plan.sh emits) reported PASS on a fully
|
||||
# dark-hooks state.
|
||||
case "${OUT}" in
|
||||
*'PLAN TAMPERED'*)
|
||||
*'===BEGIN-PWF-DATA'*)
|
||||
BYTES="$(printf '%s' "${OUT}" | wc -c | tr -d '[:space:]')"
|
||||
ok "injection: emits plan context (${BYTES} bytes)"
|
||||
;;
|
||||
*'[PLAN TAMPERED'*)
|
||||
warn "injection: plan is attested but the hash mismatches — run /plan-attest (or scripts/attest-plan.sh) to re-approve the current plan"
|
||||
;;
|
||||
*'requires attested plan'*)
|
||||
warn "injection: v3 mode without attestation — run attest-plan once to arm injection"
|
||||
;;
|
||||
*'Session isolation is armed'*)
|
||||
# Refusal notice, not plan context: reporting its byte count as
|
||||
# PASS told a dark user their hooks were fine.
|
||||
warn "injection: session isolation refuses this session — attach it with PWF_SESSION_ID=<id> plus .planning/sessions/<id>.attached, or delete the .planning/sessions/ dir (stale ones survive earlier Codex use and copied project trees) to turn isolation off"
|
||||
;;
|
||||
*'Ambiguous plan'*)
|
||||
warn "injection: nested-plan ambiguity — a project directly below this cwd carries its own plan, so hooks refuse to guess. Pin the thread with PWF_PLAN_ROOT=<absolute project root> or PLAN_ID=<slug>"
|
||||
;;
|
||||
*'PWF_PLAN_ROOT is not a directory'*)
|
||||
warn "injection: PWF_PLAN_ROOT points at a missing directory — fix or unset the pin; a broken pin fails closed and injects nothing"
|
||||
*'PWF_PLAN_ROOT is not a supported absolute local directory'*)
|
||||
warn "injection: PWF_PLAN_ROOT points at something that is not an absolute local directory — fix or unset the pin; a broken pin fails closed and injects nothing"
|
||||
;;
|
||||
*'PLAN_ID does not name a plan directory'*)
|
||||
warn "injection: PLAN_ID names no plan directory under .planning — fix or unset the pin; a set PLAN_ID is a binding and fails closed rather than selecting another plan"
|
||||
;;
|
||||
*)
|
||||
BYTES="$(printf '%s' "${OUT}" | wc -c | tr -d '[:space:]')"
|
||||
ok "injection: emits plan context (${BYTES} bytes)"
|
||||
warn "injection: inject-plan.sh emitted ${BYTES} bytes but no ===BEGIN-PWF-DATA frame, so no plan context reached the model. This is a refusal notice this doctor does not recognize; read it directly with: sh scripts/inject-plan.sh --context=userprompt"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
@@ -130,6 +130,13 @@ function Test-WithinRoot {
|
||||
|
||||
$activeFile = Join-Path $PlanRoot ".active_plan"
|
||||
|
||||
# A set PLAN_ID is a BINDING, not a hint (issue #237). A selector that names
|
||||
# no directory, fails slug validation, or fails containment terminates
|
||||
# resolution instead of falling through to .active_plan and newest-by-mtime:
|
||||
# the fall-through let a one-character typo attest and inject a DIFFERENT plan
|
||||
# at rc=0. Emptiness is the fail-closed signal on this channel, matching
|
||||
# resolve-plan-dir.sh and the PWF_PLAN_ROOT pin. An empty $env:PLAN_ID is
|
||||
# falsy here and still means "unset".
|
||||
if ($env:PLAN_ID) {
|
||||
if (Test-ValidSlug $env:PLAN_ID) {
|
||||
$candidate = Join-Path $PlanRoot $env:PLAN_ID
|
||||
@@ -138,16 +145,20 @@ if ($env:PLAN_ID) {
|
||||
exit 0
|
||||
}
|
||||
}
|
||||
exit 0
|
||||
}
|
||||
|
||||
if (Test-Path -LiteralPath $activeFile) {
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not $activeItem.PSIsContainer -and
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) {
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
} else {
|
||||
$planId = $null
|
||||
# Get-Item observes the link object even when its target is missing, unlike
|
||||
# Test-Path which follows the target. An active pointer that is a directory or
|
||||
# reparse point is an unsafe/ambiguous selector and must terminate resolution;
|
||||
# falling through would silently select and expose the newest unrelated plan.
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem) {
|
||||
if ($activeItem.PSIsContainer -or
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0)) {
|
||||
exit 0
|
||||
}
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
if ($planId -and (Test-ValidSlug $planId)) {
|
||||
$candidate = Join-Path $PlanRoot $planId
|
||||
if ((Test-Path $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
|
||||
|
||||
@@ -90,10 +90,54 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
@@ -105,12 +149,9 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -180,7 +221,8 @@ is_within_root() {
|
||||
}
|
||||
|
||||
# Portable mtime resolver. Tries GNU stat, BSD stat, BSD/macOS date -r,
|
||||
# python3, then perl. Returns "0" on full miss so callers can sort.
|
||||
# then an explicitly trusted Python interpreter. Returns "0" on a full miss
|
||||
# so newest-plan selection fails closed instead of executing from PATH.
|
||||
mtime_of() {
|
||||
target="$1"
|
||||
out="$(stat -c '%Y' "${target}" 2>/dev/null)"
|
||||
@@ -189,16 +231,9 @@ mtime_of() {
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
out="$(date -r "${target}" +%s 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
out="$(perl -e 'print((stat shift)[9])' "${target}" 2>/dev/null)"
|
||||
_mtime_python="$(trusted_python)" || _mtime_python=""
|
||||
if [ -n "${_mtime_python}" ]; then
|
||||
out="$("${_mtime_python}" -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
printf "0\n"
|
||||
@@ -262,7 +297,34 @@ resolve_latest_dir() {
|
||||
return 1
|
||||
}
|
||||
|
||||
if resolve_from_env; then exit 0; fi
|
||||
# A set PLAN_ID is a BINDING, not a hint (issue #237).
|
||||
#
|
||||
# resolve_from_env returns 1 both when no selector was set and when the
|
||||
# selector was rejected, so continuing the chain after it turned a
|
||||
# one-character typo into a silent switch: .active_plan or newest-by-mtime
|
||||
# answered instead, attest-plan.sh locked THAT plan at rc=0, and injection
|
||||
# followed the attestation onto it. commands/plan-attest.md already promised
|
||||
# the opposite ("It never falls back to another plan").
|
||||
#
|
||||
# Any non-empty PLAN_ID therefore terminates resolution here, whether it was
|
||||
# rejected for slug shape (traversal), for naming no directory, or for failing
|
||||
# containment. The caller receives an empty result and takes its own
|
||||
# fail-closed path rather than a different plan. PWF_PLAN_ROOT, the sibling
|
||||
# selector, has failed closed on any bad value since #212; the two selectors
|
||||
# now agree.
|
||||
#
|
||||
# An EMPTY PLAN_ID still means "unset": init-session.sh passes
|
||||
# PLAN_ID="${PLAN_ID:-}" into attest-plan.sh on the legacy path and depends on
|
||||
# that spelling resolving the root plan.
|
||||
#
|
||||
# Exit status stays 0 on the refusal (see the header contract). Emptiness is
|
||||
# the fail-closed signal on this channel, exactly as the PWF_PLAN_ROOT guard
|
||||
# above already does it; a non-zero status would kill callers running under
|
||||
# set -e for a condition that is not an internal error.
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
resolve_from_env && exit 0
|
||||
exit 0
|
||||
fi
|
||||
if resolve_from_active_file; then exit 0; fi
|
||||
if resolve_latest_dir; then exit 0; fi
|
||||
exit 0
|
||||
|
||||
@@ -181,7 +181,7 @@ Helper scripts for automation:
|
||||
|
||||
- `scripts/init-session.sh` — Initialize planning files. With a name arg, creates an isolated plan under `.planning/YYYY-MM-DD-<slug>/` for parallel task workflows. Without args, writes `task_plan.md` at project root (legacy mode, backward-compatible).
|
||||
- `scripts/set-active-plan.sh` — Switch the active plan pointer (`.planning/.active_plan`). Run with a plan ID to switch; run without args to show which plan is current.
|
||||
- `scripts/resolve-plan-dir.sh` — Resolve the active plan directory. Checks `$PLAN_ID` env var first, then `.planning/.active_plan`, then newest plan dir by mtime, then falls back to project root (legacy). Used internally by hooks.
|
||||
- `scripts/resolve-plan-dir.sh` — Resolve the active plan directory. A set `$PLAN_ID` is a binding: it resolves or resolution stops, never another plan (issue #237). With no `$PLAN_ID`, checks `.planning/.active_plan`, then newest plan dir by mtime, then falls back to project root (legacy). Used internally by hooks.
|
||||
- `scripts/check-complete.sh` — Verify all phases in the active plan are complete.
|
||||
- `scripts/session-catchup.py`: Explicit same-project session-record aggregation or bounded replay (`--metadata` / `--replay`); bare invocation does not access host history. OpenCode uses its read-only SQLite store.
|
||||
- `scripts/attest-plan.sh` (and `.ps1`) — Lock the current `task_plan.md` content with a SHA-256 attestation (v2.37.0). Hooks then refuse to inject plan content if the file diverges from the attested hash. Use `--show` to print the stored hash, `--clear` to remove the attestation.
|
||||
|
||||
@@ -32,6 +32,9 @@ param(
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
if (-not $script:IsWindowsHost) {
|
||||
throw "Safe no-follow descriptor operations are unavailable in this PowerShell script on Unix. Use scripts/attest-plan.sh instead."
|
||||
}
|
||||
if ($script:IsWindowsHost -and -not ("PwfAttestationNative" -as [type])) {
|
||||
Add-Type -TypeDefinition @'
|
||||
using System;
|
||||
@@ -382,6 +385,21 @@ function Resolve-ContainedPlanFile {
|
||||
} catch { return $null }
|
||||
}
|
||||
|
||||
function Test-SlugPlanDirectory {
|
||||
param([string] $Directory)
|
||||
try {
|
||||
$finalDirectory = [PwfAttestationNative]::FinalDirectoryPath($Directory)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
$planningDirectory = Split-Path -Parent $finalDirectory
|
||||
$planId = Split-Path -Leaf $finalDirectory
|
||||
return (
|
||||
(Split-Path -Leaf $planningDirectory) -eq ".planning" -and
|
||||
$planId -match '^[A-Za-z0-9_][A-Za-z0-9._-]*$'
|
||||
)
|
||||
}
|
||||
|
||||
function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
@@ -395,10 +413,17 @@ function Resolve-PlanFile {
|
||||
# fall through and attest an unrelated legacy-root plan.
|
||||
if ($env:PWF_PLAN_ROOT -or $env:PLAN_ID) { return $null }
|
||||
$activePointer = Join-Path (Join-Path (Get-Location) ".planning") ".active_plan"
|
||||
if (Test-Path -LiteralPath $activePointer) { return $null }
|
||||
$activePointerItem = Get-Item -LiteralPath $activePointer -Force -ErrorAction SilentlyContinue
|
||||
if ($activePointerItem) { return $null }
|
||||
|
||||
$legacy = Join-Path (Get-Location) "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory (Get-Location).Path)
|
||||
$currentDirectory = (Get-Location).Path
|
||||
if (Test-SlugPlanDirectory $currentDirectory) {
|
||||
$slugPlan = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $slugPlan -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
$legacy = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
function Get-AttestationPath {
|
||||
@@ -406,6 +431,9 @@ function Get-AttestationPath {
|
||||
$planDir = Split-Path -Parent $PlanFile
|
||||
$cwd = (Get-Location).Path
|
||||
if ($planDir -eq $cwd) {
|
||||
if (Test-SlugPlanDirectory $cwd) {
|
||||
return (Join-Path $cwd ".attestation")
|
||||
}
|
||||
return (Join-Path $cwd ".plan-attestation")
|
||||
}
|
||||
return (Join-Path $planDir ".attestation")
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
# 1. $PLAN_ID env var → ./.planning/$PLAN_ID/
|
||||
# 2. ./.planning/.active_plan
|
||||
# 3. Newest ./.planning/<dir>/ by mtime
|
||||
# 4. Legacy ./task_plan.md at project root
|
||||
# 4. Current directory when it is .planning/<valid-slug>/
|
||||
# 5. Legacy ./task_plan.md at project root
|
||||
#
|
||||
# Usage:
|
||||
# sh scripts/attest-plan.sh # attest the active plan
|
||||
@@ -21,6 +22,25 @@ set -u
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
RESOLVER="${SCRIPT_DIR}/resolve-plan-dir.sh"
|
||||
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
resolve_from_slug_cwd() {
|
||||
slug_cwd="$(pwd -P 2>/dev/null)" || return 1
|
||||
planning_dir="${slug_cwd%/*}"
|
||||
[ "${planning_dir##*/}" = ".planning" ] || return 1
|
||||
plan_id="${slug_cwd##*/}"
|
||||
slug_is_valid "${plan_id}" || return 1
|
||||
[ -f "${slug_cwd}/task_plan.md" ] || return 1
|
||||
printf "%s\n" "${slug_cwd}/task_plan.md"
|
||||
}
|
||||
|
||||
resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
@@ -30,6 +50,22 @@ resolve_plan_file() {
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Explicit selectors are bindings, not hints. If the shared resolver
|
||||
# rejected one, do not attest a different plan through a cwd fallback.
|
||||
if [ -n "${PWF_PLAN_ROOT:-}" ] || [ -n "${PLAN_ID:-}" ]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
# An absolute script path does not change the invoking shell's cwd. When
|
||||
# that cwd is a slug plan directory, keep slug-mode storage semantics
|
||||
# instead of misclassifying its task_plan.md as a legacy root plan.
|
||||
slug_plan_file="$(resolve_from_slug_cwd)" || slug_plan_file=""
|
||||
if [ -n "${slug_plan_file}" ]; then
|
||||
printf "%s\n" "${slug_plan_file}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "./task_plan.md" ]; then
|
||||
printf "%s\n" "./task_plan.md"
|
||||
return 0
|
||||
@@ -72,7 +108,18 @@ case "${1:-}" in
|
||||
esac
|
||||
|
||||
plan_file="$(resolve_plan_file)" || {
|
||||
printf "[plan-attest] No task_plan.md found. Create a plan first.\n" >&2
|
||||
# Name the actual cause. "No task_plan.md found" is true but misleading
|
||||
# when the plan exists and an explicit selector was rejected: before #237
|
||||
# a mistyped PLAN_ID attested a DIFFERENT plan at rc=0, and an operator
|
||||
# who now sees a generic not-found is likely to go looking for the wrong
|
||||
# problem. The selectors are bindings, so say which one refused.
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
printf "[plan-attest] PLAN_ID=%s names no plan directory under .planning. An explicit selector is a binding: nothing was attested and no other plan was substituted.\n" "${PLAN_ID}" >&2
|
||||
elif [ -n "${PWF_PLAN_ROOT:-}" ]; then
|
||||
printf "[plan-attest] PWF_PLAN_ROOT=%s did not resolve to a project root holding a plan. An explicit pin is a binding: nothing was attested and no other plan was substituted.\n" "${PWF_PLAN_ROOT}" >&2
|
||||
else
|
||||
printf "[plan-attest] No task_plan.md found. Create a plan first.\n" >&2
|
||||
fi
|
||||
exit 1
|
||||
}
|
||||
|
||||
|
||||
@@ -107,13 +107,27 @@ if (-not $Gate) {
|
||||
|
||||
# ---- Gate path (-Gate). Resolves to advisory unless every guard says block. ----
|
||||
|
||||
# Guard 1: gated mode. The .mode file must contain "gate".
|
||||
# Guard 1: gated mode. A .mode file must contain "gate".
|
||||
#
|
||||
# The project's root .mode is a FLOOR, not a default that slug scope replaces
|
||||
# (issue #238). Reading only <plan-dir>\.mode let a slug plan with no .mode
|
||||
# drop a project-committed gate. "gate" from EITHER file arms the gate; a slug
|
||||
# may raise strictness, never lower it. In root scope $PlanDir already IS the
|
||||
# project root, so the second source is skipped and behavior is unchanged.
|
||||
$modeFile = Join-Path $PlanDir ".mode"
|
||||
$rootForMode = if ($env:PWF_PLAN_ROOT) { $env:PWF_PLAN_ROOT } else { "." }
|
||||
$rootModeFile = $null
|
||||
if ($PlanDir -ne $rootForMode -and $PlanDir -ne ".") {
|
||||
$rootModeFile = Join-Path $rootForMode ".mode"
|
||||
}
|
||||
$gatedMode = $false
|
||||
if (Test-Path $modeFile) {
|
||||
$modeContent = Get-Content $modeFile -Raw -ErrorAction SilentlyContinue
|
||||
foreach ($candidateMode in @($modeFile, $rootModeFile)) {
|
||||
if (-not $candidateMode) { continue }
|
||||
if (-not (Test-Path $candidateMode)) { continue }
|
||||
$modeContent = Get-Content $candidateMode -Raw -ErrorAction SilentlyContinue
|
||||
if ($null -ne $modeContent -and $modeContent -match "gate") {
|
||||
$gatedMode = $true
|
||||
break
|
||||
}
|
||||
}
|
||||
if (-not $gatedMode) {
|
||||
|
||||
@@ -60,6 +60,14 @@ else
|
||||
if [ -n "${RESOLVED_DIR}" ] && [ -f "${RESOLVED_DIR}/task_plan.md" ]; then
|
||||
PLAN_FILE="${RESOLVED_DIR}/task_plan.md"
|
||||
PLAN_DIR="${RESOLVED_DIR}"
|
||||
elif [ -n "${PLAN_ID:-}" ] || [ -n "${PWF_PLAN_ROOT:-}" ]; then
|
||||
# Explicit selectors are bindings, not hints (issue #237). The shared
|
||||
# resolver rejected one, so the legacy cwd fallback below must not run:
|
||||
# answering a mistyped pin with the ROOT plan's completion state is the
|
||||
# same wrong-plan harm the binding removes, and here it would decide
|
||||
# whether an autonomous run is allowed to stop.
|
||||
echo "[planning-with-files] An explicit PLAN_ID or PWF_PLAN_ROOT did not resolve to a plan; no completion state was read and no other plan was substituted."
|
||||
exit 0
|
||||
else
|
||||
PLAN_FILE="task_plan.md"
|
||||
PLAN_DIR="."
|
||||
@@ -131,10 +139,30 @@ fi
|
||||
|
||||
# ---- Gate path (--gate). Resolves to advisory unless every guard says block. ----
|
||||
|
||||
# Guard 1: gated mode. The .mode file must contain "gate". Absent or other
|
||||
# Guard 1: gated mode. A .mode file must contain "gate". Absent or other
|
||||
# content means advisory mode (legacy behavior preserved).
|
||||
#
|
||||
# The project's root .mode is a FLOOR, not a default that slug scope replaces
|
||||
# (issue #238). Reading only <plan-dir>/.mode let a slug plan with no .mode
|
||||
# drop a project-committed gate, the same way it dropped the attestation
|
||||
# requirement in inject-plan.sh. "gate" from EITHER file arms the gate; a slug
|
||||
# may raise strictness, never lower it. In root scope PLAN_DIR already IS the
|
||||
# project root, so the second source stays empty and behavior is unchanged.
|
||||
MODE_FILE="${PLAN_DIR}/.mode"
|
||||
if [ ! -f "${MODE_FILE}" ] || ! grep -q "gate" "${MODE_FILE}" 2>/dev/null; then
|
||||
ROOT_MODE_FILE=""
|
||||
_root_for_mode="${PWF_PLAN_ROOT:-.}"
|
||||
if [ "${PLAN_DIR}" != "${_root_for_mode}" ] && [ "${PLAN_DIR}" != "." ]; then
|
||||
ROOT_MODE_FILE="${_root_for_mode}/.mode"
|
||||
fi
|
||||
GATED=0
|
||||
if [ -f "${MODE_FILE}" ] && grep -q "gate" "${MODE_FILE}" 2>/dev/null; then
|
||||
GATED=1
|
||||
fi
|
||||
if [ "${GATED}" -eq 0 ] && [ -n "${ROOT_MODE_FILE}" ] && [ -f "${ROOT_MODE_FILE}" ] \
|
||||
&& grep -q "gate" "${ROOT_MODE_FILE}" 2>/dev/null; then
|
||||
GATED=1
|
||||
fi
|
||||
if [ "${GATED}" -eq 0 ]; then
|
||||
advisory_report
|
||||
exit 0
|
||||
fi
|
||||
|
||||
@@ -152,6 +152,33 @@ gen_nonce() {
|
||||
# $1 = plan dir (absolute or relative); dotfiles live directly inside it.
|
||||
# $2 = plan file path (task_plan.md) used for auto-attestation resolution.
|
||||
# No-op when MODE is empty (legacy path stays byte-equivalent to v2.43.0).
|
||||
# Raise MODE to the project's committed floor before the side effects run
|
||||
# (issue #238). A project that ships a root .mode has made that setting a
|
||||
# reviewed part of the repo; a new slug plan must not start below it. Without
|
||||
# this, `init-session.sh <name>` created a plan with no .mode at all, and the
|
||||
# project's attestation requirement became a flag the agent chose at plan
|
||||
# creation time.
|
||||
#
|
||||
# inject-plan.sh enforces the same floor at read time, so this is not the
|
||||
# guard. It exists so the effective policy is VISIBLE in the plan directory
|
||||
# rather than only inside the resolver, and so the new plan gets the nonce and
|
||||
# the auto-attestation that autonomous mode needs to inject at all.
|
||||
#
|
||||
# An explicit --autonomous/--gated is never lowered: gated stays gated.
|
||||
inherit_root_mode() {
|
||||
_root_mode="${PWD}/.mode"
|
||||
[ -f "${_root_mode}" ] || return 0
|
||||
[ "$MODE" = "gated" ] && return 0
|
||||
if grep -q 'gate' "${_root_mode}" 2>/dev/null; then
|
||||
MODE='gated'
|
||||
return 0
|
||||
fi
|
||||
if grep -q 'autonomous' "${_root_mode}" 2>/dev/null; then
|
||||
MODE='autonomous'
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
apply_v3_mode() {
|
||||
_mode_dir="$1"
|
||||
_mode_plan="$2"
|
||||
@@ -367,6 +394,7 @@ if [ "$SLUG_MODE" -eq 1 ]; then
|
||||
echo "PLAN_ID=$PLAN_ID"
|
||||
create_files_in "$PLAN_DIR"
|
||||
printf "%s\n" "$PLAN_ID" > "${PLAN_ROOT}/.active_plan"
|
||||
inherit_root_mode
|
||||
apply_v3_mode "$PLAN_DIR" "${PLAN_DIR}/task_plan.md"
|
||||
echo ""
|
||||
echo "Active plan recorded: ${PLAN_ROOT}/.active_plan"
|
||||
|
||||
@@ -74,27 +74,49 @@ if [ -f "${INJ}" ]; then
|
||||
ok "injection: silent because no plan exists here (correct behavior)"
|
||||
fi
|
||||
else
|
||||
# Classify on the DATA FRAMING first, never on substrings of the whole
|
||||
# blob (issue #236). ${OUT} carries the plan body VERBATIM inside
|
||||
# ===BEGIN-PWF-DATA=== fences, so a bare substring test also matches
|
||||
# plan prose: a phase line reading "fix the false PLAN TAMPERED
|
||||
# warning" made the doctor report a hash mismatch on a correctly
|
||||
# attested plan.
|
||||
#
|
||||
# Every refusal path in inject-plan.sh prints its banner and exits
|
||||
# before frame_file runs, so a frame in the output proves injection
|
||||
# happened and rules out every refusal. Output WITHOUT a frame is by
|
||||
# construction a notice, which is why the banner arms sit under the
|
||||
# else side and the default arm warns instead of passing. A banner
|
||||
# whose wording drifts then degrades to a generic warning rather than
|
||||
# to a silent PASS: that is exactly how the stale
|
||||
# "PWF_PLAN_ROOT is not a directory" literal (which was never a
|
||||
# substring of what inject-plan.sh emits) reported PASS on a fully
|
||||
# dark-hooks state.
|
||||
case "${OUT}" in
|
||||
*'PLAN TAMPERED'*)
|
||||
*'===BEGIN-PWF-DATA'*)
|
||||
BYTES="$(printf '%s' "${OUT}" | wc -c | tr -d '[:space:]')"
|
||||
ok "injection: emits plan context (${BYTES} bytes)"
|
||||
;;
|
||||
*'[PLAN TAMPERED'*)
|
||||
warn "injection: plan is attested but the hash mismatches — run /plan-attest (or scripts/attest-plan.sh) to re-approve the current plan"
|
||||
;;
|
||||
*'requires attested plan'*)
|
||||
warn "injection: v3 mode without attestation — run attest-plan once to arm injection"
|
||||
;;
|
||||
*'Session isolation is armed'*)
|
||||
# Refusal notice, not plan context: reporting its byte count as
|
||||
# PASS told a dark user their hooks were fine.
|
||||
warn "injection: session isolation refuses this session — attach it with PWF_SESSION_ID=<id> plus .planning/sessions/<id>.attached, or delete the .planning/sessions/ dir (stale ones survive earlier Codex use and copied project trees) to turn isolation off"
|
||||
;;
|
||||
*'Ambiguous plan'*)
|
||||
warn "injection: nested-plan ambiguity — a project directly below this cwd carries its own plan, so hooks refuse to guess. Pin the thread with PWF_PLAN_ROOT=<absolute project root> or PLAN_ID=<slug>"
|
||||
;;
|
||||
*'PWF_PLAN_ROOT is not a directory'*)
|
||||
warn "injection: PWF_PLAN_ROOT points at a missing directory — fix or unset the pin; a broken pin fails closed and injects nothing"
|
||||
*'PWF_PLAN_ROOT is not a supported absolute local directory'*)
|
||||
warn "injection: PWF_PLAN_ROOT points at something that is not an absolute local directory — fix or unset the pin; a broken pin fails closed and injects nothing"
|
||||
;;
|
||||
*'PLAN_ID does not name a plan directory'*)
|
||||
warn "injection: PLAN_ID names no plan directory under .planning — fix or unset the pin; a set PLAN_ID is a binding and fails closed rather than selecting another plan"
|
||||
;;
|
||||
*)
|
||||
BYTES="$(printf '%s' "${OUT}" | wc -c | tr -d '[:space:]')"
|
||||
ok "injection: emits plan context (${BYTES} bytes)"
|
||||
warn "injection: inject-plan.sh emitted ${BYTES} bytes but no ===BEGIN-PWF-DATA frame, so no plan context reached the model. This is a refusal notice this doctor does not recognize; read it directly with: sh scripts/inject-plan.sh --context=userprompt"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
@@ -130,6 +130,13 @@ function Test-WithinRoot {
|
||||
|
||||
$activeFile = Join-Path $PlanRoot ".active_plan"
|
||||
|
||||
# A set PLAN_ID is a BINDING, not a hint (issue #237). A selector that names
|
||||
# no directory, fails slug validation, or fails containment terminates
|
||||
# resolution instead of falling through to .active_plan and newest-by-mtime:
|
||||
# the fall-through let a one-character typo attest and inject a DIFFERENT plan
|
||||
# at rc=0. Emptiness is the fail-closed signal on this channel, matching
|
||||
# resolve-plan-dir.sh and the PWF_PLAN_ROOT pin. An empty $env:PLAN_ID is
|
||||
# falsy here and still means "unset".
|
||||
if ($env:PLAN_ID) {
|
||||
if (Test-ValidSlug $env:PLAN_ID) {
|
||||
$candidate = Join-Path $PlanRoot $env:PLAN_ID
|
||||
@@ -138,16 +145,20 @@ if ($env:PLAN_ID) {
|
||||
exit 0
|
||||
}
|
||||
}
|
||||
exit 0
|
||||
}
|
||||
|
||||
if (Test-Path -LiteralPath $activeFile) {
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not $activeItem.PSIsContainer -and
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) {
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
} else {
|
||||
$planId = $null
|
||||
# Get-Item observes the link object even when its target is missing, unlike
|
||||
# Test-Path which follows the target. An active pointer that is a directory or
|
||||
# reparse point is an unsafe/ambiguous selector and must terminate resolution;
|
||||
# falling through would silently select and expose the newest unrelated plan.
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem) {
|
||||
if ($activeItem.PSIsContainer -or
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0)) {
|
||||
exit 0
|
||||
}
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
if ($planId -and (Test-ValidSlug $planId)) {
|
||||
$candidate = Join-Path $PlanRoot $planId
|
||||
if ((Test-Path $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
|
||||
|
||||
@@ -90,10 +90,54 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
@@ -105,12 +149,9 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -180,7 +221,8 @@ is_within_root() {
|
||||
}
|
||||
|
||||
# Portable mtime resolver. Tries GNU stat, BSD stat, BSD/macOS date -r,
|
||||
# python3, then perl. Returns "0" on full miss so callers can sort.
|
||||
# then an explicitly trusted Python interpreter. Returns "0" on a full miss
|
||||
# so newest-plan selection fails closed instead of executing from PATH.
|
||||
mtime_of() {
|
||||
target="$1"
|
||||
out="$(stat -c '%Y' "${target}" 2>/dev/null)"
|
||||
@@ -189,16 +231,9 @@ mtime_of() {
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
out="$(date -r "${target}" +%s 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
out="$(perl -e 'print((stat shift)[9])' "${target}" 2>/dev/null)"
|
||||
_mtime_python="$(trusted_python)" || _mtime_python=""
|
||||
if [ -n "${_mtime_python}" ]; then
|
||||
out="$("${_mtime_python}" -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
printf "0\n"
|
||||
@@ -262,7 +297,34 @@ resolve_latest_dir() {
|
||||
return 1
|
||||
}
|
||||
|
||||
if resolve_from_env; then exit 0; fi
|
||||
# A set PLAN_ID is a BINDING, not a hint (issue #237).
|
||||
#
|
||||
# resolve_from_env returns 1 both when no selector was set and when the
|
||||
# selector was rejected, so continuing the chain after it turned a
|
||||
# one-character typo into a silent switch: .active_plan or newest-by-mtime
|
||||
# answered instead, attest-plan.sh locked THAT plan at rc=0, and injection
|
||||
# followed the attestation onto it. commands/plan-attest.md already promised
|
||||
# the opposite ("It never falls back to another plan").
|
||||
#
|
||||
# Any non-empty PLAN_ID therefore terminates resolution here, whether it was
|
||||
# rejected for slug shape (traversal), for naming no directory, or for failing
|
||||
# containment. The caller receives an empty result and takes its own
|
||||
# fail-closed path rather than a different plan. PWF_PLAN_ROOT, the sibling
|
||||
# selector, has failed closed on any bad value since #212; the two selectors
|
||||
# now agree.
|
||||
#
|
||||
# An EMPTY PLAN_ID still means "unset": init-session.sh passes
|
||||
# PLAN_ID="${PLAN_ID:-}" into attest-plan.sh on the legacy path and depends on
|
||||
# that spelling resolving the root plan.
|
||||
#
|
||||
# Exit status stays 0 on the refusal (see the header contract). Emptiness is
|
||||
# the fail-closed signal on this channel, exactly as the PWF_PLAN_ROOT guard
|
||||
# above already does it; a non-zero status would kill callers running under
|
||||
# set -e for a condition that is not an internal error.
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
resolve_from_env && exit 0
|
||||
exit 0
|
||||
fi
|
||||
if resolve_from_active_file; then exit 0; fi
|
||||
if resolve_latest_dir; then exit 0; fi
|
||||
exit 0
|
||||
|
||||
@@ -36,7 +36,7 @@ hooks:
|
||||
- type: command
|
||||
command: "SH=\"\"; for c in \"${PWF_SCRIPT_DIR}/inject-plan.sh\" \"${CLAUDE_SKILL_DIR}/scripts/inject-plan.sh\" \"$HOME/.cursor/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/inject-plan.sh\"; do [ -f \"$c\" ] && { SH=\"$c\"; break; }; done; [ -n \"$SH\" ] && sh \"$SH\" --context=precompact; exit 0"
|
||||
metadata:
|
||||
version: "3.12.0"
|
||||
version: "3.16.0"
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -32,6 +32,9 @@ param(
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
if (-not $script:IsWindowsHost) {
|
||||
throw "Safe no-follow descriptor operations are unavailable in this PowerShell script on Unix. Use scripts/attest-plan.sh instead."
|
||||
}
|
||||
if ($script:IsWindowsHost -and -not ("PwfAttestationNative" -as [type])) {
|
||||
Add-Type -TypeDefinition @'
|
||||
using System;
|
||||
@@ -382,6 +385,21 @@ function Resolve-ContainedPlanFile {
|
||||
} catch { return $null }
|
||||
}
|
||||
|
||||
function Test-SlugPlanDirectory {
|
||||
param([string] $Directory)
|
||||
try {
|
||||
$finalDirectory = [PwfAttestationNative]::FinalDirectoryPath($Directory)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
$planningDirectory = Split-Path -Parent $finalDirectory
|
||||
$planId = Split-Path -Leaf $finalDirectory
|
||||
return (
|
||||
(Split-Path -Leaf $planningDirectory) -eq ".planning" -and
|
||||
$planId -match '^[A-Za-z0-9_][A-Za-z0-9._-]*$'
|
||||
)
|
||||
}
|
||||
|
||||
function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
@@ -395,10 +413,17 @@ function Resolve-PlanFile {
|
||||
# fall through and attest an unrelated legacy-root plan.
|
||||
if ($env:PWF_PLAN_ROOT -or $env:PLAN_ID) { return $null }
|
||||
$activePointer = Join-Path (Join-Path (Get-Location) ".planning") ".active_plan"
|
||||
if (Test-Path -LiteralPath $activePointer) { return $null }
|
||||
$activePointerItem = Get-Item -LiteralPath $activePointer -Force -ErrorAction SilentlyContinue
|
||||
if ($activePointerItem) { return $null }
|
||||
|
||||
$legacy = Join-Path (Get-Location) "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory (Get-Location).Path)
|
||||
$currentDirectory = (Get-Location).Path
|
||||
if (Test-SlugPlanDirectory $currentDirectory) {
|
||||
$slugPlan = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $slugPlan -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
$legacy = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
function Get-AttestationPath {
|
||||
@@ -406,6 +431,9 @@ function Get-AttestationPath {
|
||||
$planDir = Split-Path -Parent $PlanFile
|
||||
$cwd = (Get-Location).Path
|
||||
if ($planDir -eq $cwd) {
|
||||
if (Test-SlugPlanDirectory $cwd) {
|
||||
return (Join-Path $cwd ".attestation")
|
||||
}
|
||||
return (Join-Path $cwd ".plan-attestation")
|
||||
}
|
||||
return (Join-Path $planDir ".attestation")
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
# 1. $PLAN_ID env var → ./.planning/$PLAN_ID/
|
||||
# 2. ./.planning/.active_plan
|
||||
# 3. Newest ./.planning/<dir>/ by mtime
|
||||
# 4. Legacy ./task_plan.md at project root
|
||||
# 4. Current directory when it is .planning/<valid-slug>/
|
||||
# 5. Legacy ./task_plan.md at project root
|
||||
#
|
||||
# Usage:
|
||||
# sh scripts/attest-plan.sh # attest the active plan
|
||||
@@ -21,6 +22,25 @@ set -u
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
RESOLVER="${SCRIPT_DIR}/resolve-plan-dir.sh"
|
||||
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
resolve_from_slug_cwd() {
|
||||
slug_cwd="$(pwd -P 2>/dev/null)" || return 1
|
||||
planning_dir="${slug_cwd%/*}"
|
||||
[ "${planning_dir##*/}" = ".planning" ] || return 1
|
||||
plan_id="${slug_cwd##*/}"
|
||||
slug_is_valid "${plan_id}" || return 1
|
||||
[ -f "${slug_cwd}/task_plan.md" ] || return 1
|
||||
printf "%s\n" "${slug_cwd}/task_plan.md"
|
||||
}
|
||||
|
||||
resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
@@ -30,6 +50,22 @@ resolve_plan_file() {
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Explicit selectors are bindings, not hints. If the shared resolver
|
||||
# rejected one, do not attest a different plan through a cwd fallback.
|
||||
if [ -n "${PWF_PLAN_ROOT:-}" ] || [ -n "${PLAN_ID:-}" ]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
# An absolute script path does not change the invoking shell's cwd. When
|
||||
# that cwd is a slug plan directory, keep slug-mode storage semantics
|
||||
# instead of misclassifying its task_plan.md as a legacy root plan.
|
||||
slug_plan_file="$(resolve_from_slug_cwd)" || slug_plan_file=""
|
||||
if [ -n "${slug_plan_file}" ]; then
|
||||
printf "%s\n" "${slug_plan_file}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "./task_plan.md" ]; then
|
||||
printf "%s\n" "./task_plan.md"
|
||||
return 0
|
||||
@@ -72,7 +108,18 @@ case "${1:-}" in
|
||||
esac
|
||||
|
||||
plan_file="$(resolve_plan_file)" || {
|
||||
printf "[plan-attest] No task_plan.md found. Create a plan first.\n" >&2
|
||||
# Name the actual cause. "No task_plan.md found" is true but misleading
|
||||
# when the plan exists and an explicit selector was rejected: before #237
|
||||
# a mistyped PLAN_ID attested a DIFFERENT plan at rc=0, and an operator
|
||||
# who now sees a generic not-found is likely to go looking for the wrong
|
||||
# problem. The selectors are bindings, so say which one refused.
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
printf "[plan-attest] PLAN_ID=%s names no plan directory under .planning. An explicit selector is a binding: nothing was attested and no other plan was substituted.\n" "${PLAN_ID}" >&2
|
||||
elif [ -n "${PWF_PLAN_ROOT:-}" ]; then
|
||||
printf "[plan-attest] PWF_PLAN_ROOT=%s did not resolve to a project root holding a plan. An explicit pin is a binding: nothing was attested and no other plan was substituted.\n" "${PWF_PLAN_ROOT}" >&2
|
||||
else
|
||||
printf "[plan-attest] No task_plan.md found. Create a plan first.\n" >&2
|
||||
fi
|
||||
exit 1
|
||||
}
|
||||
|
||||
|
||||
@@ -107,13 +107,27 @@ if (-not $Gate) {
|
||||
|
||||
# ---- Gate path (-Gate). Resolves to advisory unless every guard says block. ----
|
||||
|
||||
# Guard 1: gated mode. The .mode file must contain "gate".
|
||||
# Guard 1: gated mode. A .mode file must contain "gate".
|
||||
#
|
||||
# The project's root .mode is a FLOOR, not a default that slug scope replaces
|
||||
# (issue #238). Reading only <plan-dir>\.mode let a slug plan with no .mode
|
||||
# drop a project-committed gate. "gate" from EITHER file arms the gate; a slug
|
||||
# may raise strictness, never lower it. In root scope $PlanDir already IS the
|
||||
# project root, so the second source is skipped and behavior is unchanged.
|
||||
$modeFile = Join-Path $PlanDir ".mode"
|
||||
$rootForMode = if ($env:PWF_PLAN_ROOT) { $env:PWF_PLAN_ROOT } else { "." }
|
||||
$rootModeFile = $null
|
||||
if ($PlanDir -ne $rootForMode -and $PlanDir -ne ".") {
|
||||
$rootModeFile = Join-Path $rootForMode ".mode"
|
||||
}
|
||||
$gatedMode = $false
|
||||
if (Test-Path $modeFile) {
|
||||
$modeContent = Get-Content $modeFile -Raw -ErrorAction SilentlyContinue
|
||||
foreach ($candidateMode in @($modeFile, $rootModeFile)) {
|
||||
if (-not $candidateMode) { continue }
|
||||
if (-not (Test-Path $candidateMode)) { continue }
|
||||
$modeContent = Get-Content $candidateMode -Raw -ErrorAction SilentlyContinue
|
||||
if ($null -ne $modeContent -and $modeContent -match "gate") {
|
||||
$gatedMode = $true
|
||||
break
|
||||
}
|
||||
}
|
||||
if (-not $gatedMode) {
|
||||
|
||||
@@ -60,6 +60,14 @@ else
|
||||
if [ -n "${RESOLVED_DIR}" ] && [ -f "${RESOLVED_DIR}/task_plan.md" ]; then
|
||||
PLAN_FILE="${RESOLVED_DIR}/task_plan.md"
|
||||
PLAN_DIR="${RESOLVED_DIR}"
|
||||
elif [ -n "${PLAN_ID:-}" ] || [ -n "${PWF_PLAN_ROOT:-}" ]; then
|
||||
# Explicit selectors are bindings, not hints (issue #237). The shared
|
||||
# resolver rejected one, so the legacy cwd fallback below must not run:
|
||||
# answering a mistyped pin with the ROOT plan's completion state is the
|
||||
# same wrong-plan harm the binding removes, and here it would decide
|
||||
# whether an autonomous run is allowed to stop.
|
||||
echo "[planning-with-files] An explicit PLAN_ID or PWF_PLAN_ROOT did not resolve to a plan; no completion state was read and no other plan was substituted."
|
||||
exit 0
|
||||
else
|
||||
PLAN_FILE="task_plan.md"
|
||||
PLAN_DIR="."
|
||||
@@ -131,10 +139,30 @@ fi
|
||||
|
||||
# ---- Gate path (--gate). Resolves to advisory unless every guard says block. ----
|
||||
|
||||
# Guard 1: gated mode. The .mode file must contain "gate". Absent or other
|
||||
# Guard 1: gated mode. A .mode file must contain "gate". Absent or other
|
||||
# content means advisory mode (legacy behavior preserved).
|
||||
#
|
||||
# The project's root .mode is a FLOOR, not a default that slug scope replaces
|
||||
# (issue #238). Reading only <plan-dir>/.mode let a slug plan with no .mode
|
||||
# drop a project-committed gate, the same way it dropped the attestation
|
||||
# requirement in inject-plan.sh. "gate" from EITHER file arms the gate; a slug
|
||||
# may raise strictness, never lower it. In root scope PLAN_DIR already IS the
|
||||
# project root, so the second source stays empty and behavior is unchanged.
|
||||
MODE_FILE="${PLAN_DIR}/.mode"
|
||||
if [ ! -f "${MODE_FILE}" ] || ! grep -q "gate" "${MODE_FILE}" 2>/dev/null; then
|
||||
ROOT_MODE_FILE=""
|
||||
_root_for_mode="${PWF_PLAN_ROOT:-.}"
|
||||
if [ "${PLAN_DIR}" != "${_root_for_mode}" ] && [ "${PLAN_DIR}" != "." ]; then
|
||||
ROOT_MODE_FILE="${_root_for_mode}/.mode"
|
||||
fi
|
||||
GATED=0
|
||||
if [ -f "${MODE_FILE}" ] && grep -q "gate" "${MODE_FILE}" 2>/dev/null; then
|
||||
GATED=1
|
||||
fi
|
||||
if [ "${GATED}" -eq 0 ] && [ -n "${ROOT_MODE_FILE}" ] && [ -f "${ROOT_MODE_FILE}" ] \
|
||||
&& grep -q "gate" "${ROOT_MODE_FILE}" 2>/dev/null; then
|
||||
GATED=1
|
||||
fi
|
||||
if [ "${GATED}" -eq 0 ]; then
|
||||
advisory_report
|
||||
exit 0
|
||||
fi
|
||||
|
||||
@@ -152,6 +152,33 @@ gen_nonce() {
|
||||
# $1 = plan dir (absolute or relative); dotfiles live directly inside it.
|
||||
# $2 = plan file path (task_plan.md) used for auto-attestation resolution.
|
||||
# No-op when MODE is empty (legacy path stays byte-equivalent to v2.43.0).
|
||||
# Raise MODE to the project's committed floor before the side effects run
|
||||
# (issue #238). A project that ships a root .mode has made that setting a
|
||||
# reviewed part of the repo; a new slug plan must not start below it. Without
|
||||
# this, `init-session.sh <name>` created a plan with no .mode at all, and the
|
||||
# project's attestation requirement became a flag the agent chose at plan
|
||||
# creation time.
|
||||
#
|
||||
# inject-plan.sh enforces the same floor at read time, so this is not the
|
||||
# guard. It exists so the effective policy is VISIBLE in the plan directory
|
||||
# rather than only inside the resolver, and so the new plan gets the nonce and
|
||||
# the auto-attestation that autonomous mode needs to inject at all.
|
||||
#
|
||||
# An explicit --autonomous/--gated is never lowered: gated stays gated.
|
||||
inherit_root_mode() {
|
||||
_root_mode="${PWD}/.mode"
|
||||
[ -f "${_root_mode}" ] || return 0
|
||||
[ "$MODE" = "gated" ] && return 0
|
||||
if grep -q 'gate' "${_root_mode}" 2>/dev/null; then
|
||||
MODE='gated'
|
||||
return 0
|
||||
fi
|
||||
if grep -q 'autonomous' "${_root_mode}" 2>/dev/null; then
|
||||
MODE='autonomous'
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
apply_v3_mode() {
|
||||
_mode_dir="$1"
|
||||
_mode_plan="$2"
|
||||
@@ -367,6 +394,7 @@ if [ "$SLUG_MODE" -eq 1 ]; then
|
||||
echo "PLAN_ID=$PLAN_ID"
|
||||
create_files_in "$PLAN_DIR"
|
||||
printf "%s\n" "$PLAN_ID" > "${PLAN_ROOT}/.active_plan"
|
||||
inherit_root_mode
|
||||
apply_v3_mode "$PLAN_DIR" "${PLAN_DIR}/task_plan.md"
|
||||
echo ""
|
||||
echo "Active plan recorded: ${PLAN_ROOT}/.active_plan"
|
||||
|
||||
@@ -27,27 +27,26 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Select a working interpreter, not merely the first executable name on PATH.
|
||||
# Validate candidate interpreters supplied by the selector wrappers below.
|
||||
# Windows Store app aliases can exist as python3.exe while refusing every
|
||||
# script invocation. Probe candidates privately and fail closed if none runs.
|
||||
select_python() {
|
||||
# PWF_TRUSTED_PYTHON is the explicit trust path. PYTHON_BIN remains a
|
||||
# compatibility alias. PATH discovery is a deliberate fallback: the hook
|
||||
# treats the caller's PATH as executable trust, but still requires the
|
||||
# resolved candidate to be an absolute regular executable.
|
||||
for _sp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}" "$(command -v python3 2>/dev/null)" "$(command -v python 2>/dev/null)"; do
|
||||
select_python_candidates() {
|
||||
for _sp_candidate in "$@"; do
|
||||
[ -n "$_sp_candidate" ] || continue
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
case "$_sp_candidate" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
# Git Bash cannot reliably test or invoke C:\... spelling.
|
||||
# Convert before every filesystem predicate and invocation.
|
||||
command -v cygpath >/dev/null 2>&1 || continue
|
||||
_sp_candidate="$(cygpath -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
# Convert with Git Bash's fixed system helper, never PATH.
|
||||
_sp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "$_sp_cygpath" ] && [ -x "$_sp_cygpath" ] || continue
|
||||
_sp_candidate="$("$_sp_cygpath" -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
[ -f "$_sp_candidate" ] || continue
|
||||
[ -x "$_sp_candidate" ] || continue
|
||||
if "$_sp_candidate" -c 'import sys; raise SystemExit(0 if sys.version_info >= (3, 8) else 1)' >/dev/null 2>&1; then
|
||||
@@ -58,6 +57,21 @@ select_python() {
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment may use only an interpreter path the caller explicitly trusted.
|
||||
select_explicit_python() {
|
||||
select_python_candidates "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"
|
||||
}
|
||||
|
||||
# After containment succeeds, PATH discovery remains a compatibility fallback
|
||||
# for hosts that do not export an interpreter path to direct hook invocations.
|
||||
select_python() {
|
||||
select_python_candidates \
|
||||
"${PWF_TRUSTED_PYTHON:-}" \
|
||||
"${PYTHON_BIN:-}" \
|
||||
"$(command -v python3 2>/dev/null)" \
|
||||
"$(command -v python 2>/dev/null)"
|
||||
}
|
||||
|
||||
# issue #195: per-invocation opt-out (PLANNING_DISABLED=1) for one-shot/CI
|
||||
# sessions that share a cwd with a plan but never opted into it.
|
||||
[ "${PLANNING_DISABLED:-}" = "1" ] && exit 0
|
||||
@@ -154,13 +168,24 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
# (Copied verbatim from resolve-plan-dir.sh so hook injection gets the same
|
||||
# symlink containment as the resolver — see security A1.3.)
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Matching is case-insensitive and works after slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils), then
|
||||
# readlink -f (older GNU), then the interpreter already validated by
|
||||
# select_python(). Prints the canonical absolute path on success; prints
|
||||
# nothing and returns 1 on a full miss so the caller can decide what to do.
|
||||
# The fallback must not rediscover or execute an unvalidated PATH interpreter.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
@@ -171,12 +196,8 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
if [ -n "${PWF_PYTHON:-}" ]; then
|
||||
out="$("${PWF_PYTHON}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -233,8 +254,28 @@ SCOPE=""
|
||||
EXPLICIT=0
|
||||
[ -n "$PLAN_PREFIX" ] && EXPLICIT=1
|
||||
[ "$SESSION_ATTACHED" = "1" ] && EXPLICIT=1
|
||||
if [ -n "${PLAN_ID:-}" ] && slug_is_valid "$PLAN_ID" && [ -d "${PLAN_PREFIX}.planning/${PLAN_ID}" ]; then
|
||||
RESOLVED="${PLAN_PREFIX}.planning/${PLAN_ID}"; SCOPE="scoped"; EXPLICIT=1
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
# A set PLAN_ID is a BINDING, not a hint (issue #237). This inline resolver
|
||||
# is the one the hooks actually run, so it carries the same rule as
|
||||
# resolve-plan-dir.sh: a selector that names no directory, fails slug
|
||||
# validation, or fails containment refuses instead of falling through to
|
||||
# .active_plan and newest-by-mtime. The fall-through is what let a
|
||||
# one-character typo inject a DIFFERENT plan while attest-plan.sh locked
|
||||
# that same wrong plan at rc=0.
|
||||
#
|
||||
# Unlike the PWF_PLAN_ROOT refusal above, the notice is userprompt-only.
|
||||
# pretool fires per tool call and precompact carries no plan body, so
|
||||
# printing on those would spam the transcript with the same line. The
|
||||
# userprompt fire is also the one plan-doctor.sh drives, so /plan-doctor
|
||||
# still sees and reports the state.
|
||||
if slug_is_valid "$PLAN_ID" && [ -d "${PLAN_PREFIX}.planning/${PLAN_ID}" ]; then
|
||||
RESOLVED="${PLAN_PREFIX}.planning/${PLAN_ID}"; SCOPE="scoped"; EXPLICIT=1
|
||||
else
|
||||
if [ "$CONTEXT" = "userprompt" ]; then
|
||||
echo "[planning-with-files] PLAN_ID does not name a plan directory under .planning: ${PLAN_ID} — nothing injected. Fix or unset the pin; a broken pin fails closed rather than selecting another plan."
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
elif [ -f "${PLAN_PREFIX}.planning/.active_plan" ]; then
|
||||
AP=$(tr -d '\r\n[:space:]' < "${PLAN_PREFIX}.planning/.active_plan" 2>/dev/null)
|
||||
if [ -n "$AP" ] && slug_is_valid "$AP" && [ -d "${PLAN_PREFIX}.planning/${AP}" ]; then
|
||||
@@ -256,9 +297,9 @@ fi
|
||||
if [ -z "$RESOLVED" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; then RESOLVED="${PLAN_PREFIX}."; SCOPE="root"; fi
|
||||
[ -z "$RESOLVED" ] && exit 0
|
||||
|
||||
# Do not probe or execute any interpreter until a real, contained plan exists.
|
||||
# This keeps opt-out and no-plan hook fires side-effect free even when an
|
||||
# untrusted PYTHON_BIN or PATH entry points at an executable canary.
|
||||
# Do not probe or execute any interpreter until a real plan exists. Before
|
||||
# containment, only an explicit PWF_TRUSTED_PYTHON or PYTHON_BIN may be used.
|
||||
# PATH discovery remains deferred until containment succeeds.
|
||||
if [ "$SCOPE" = "root" ]; then
|
||||
PRECHECK_PLAN_FILE="${PLAN_PREFIX}task_plan.md"
|
||||
else
|
||||
@@ -266,8 +307,9 @@ else
|
||||
fi
|
||||
[ -f "$PRECHECK_PLAN_FILE" ] || exit 0
|
||||
[ -L "$PRECHECK_PLAN_FILE" ] && exit 0
|
||||
PWF_PYTHON="$(select_explicit_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
is_within_root "$PRECHECK_PLAN_FILE" || exit 0
|
||||
PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
[ -n "$PWF_PYTHON" ] || PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
|
||||
# Session attachment is evaluated only after plan existence is proven. A
|
||||
# stale sessions directory without any plan must not cause interpreter probes.
|
||||
@@ -454,12 +496,16 @@ if [ "$SCOPE" = "root" ]; then
|
||||
PROGRESS_FILE="${PLAN_PREFIX}progress.md"
|
||||
ATTEST_FILE="${PLAN_PREFIX}.plan-attestation"
|
||||
MODE_FILE="${PLAN_PREFIX}.mode"
|
||||
ROOT_MODE_FILE=""
|
||||
NONCE_FILE="${PLAN_PREFIX}.nonce"
|
||||
else
|
||||
PLAN_FILE="${RESOLVED}/task_plan.md"
|
||||
PROGRESS_FILE="${RESOLVED}/progress.md"
|
||||
ATTEST_FILE="${RESOLVED}/.attestation"
|
||||
MODE_FILE="${RESOLVED}/.mode"
|
||||
# The project's own .mode, when it has one (issue #238). In root scope
|
||||
# MODE_FILE already IS that file, so the second source stays empty.
|
||||
ROOT_MODE_FILE="${PLAN_PREFIX}.mode"
|
||||
NONCE_FILE="${RESOLVED}/.nonce"
|
||||
fi
|
||||
[ -f "$PLAN_FILE" ] || exit 0
|
||||
@@ -831,11 +877,52 @@ fi
|
||||
# gated mode to legacy behavior (platform-critical: per-tool-call injection not
|
||||
# suppressed, oracle re-hash skipped, raw progress tail injected). Use a grep
|
||||
# token test, the same pattern check-complete.sh guard 1 uses.
|
||||
|
||||
# --- Root .mode is a FLOOR, not a default that slug scope replaces (#238). ---
|
||||
# A project makes attestation mandatory by committing a root .mode, which is a
|
||||
# reviewed project setting. Slug scope used to read ONLY the slug's .mode, and
|
||||
# init-session.sh writes no .mode unless --autonomous or --gated was passed, so
|
||||
# `init-session.sh <name>` produced a plan with no mode, no attestation
|
||||
# requirement and full injection: one agent-invocable command turned the
|
||||
# project's policy off.
|
||||
#
|
||||
# mode_has answers for a strictness-RAISING token: present in EITHER file. A
|
||||
# slug may opt into autonomous/gated where the root left it unset; it can no
|
||||
# longer opt out of what the root committed.
|
||||
#
|
||||
# mode_relax_allowed answers for the one strictness-LOWERING token
|
||||
# (plan-guard-off): the slug must carry it AND, when the project committed a
|
||||
# root .mode, that file must carry it too. A slug alone cannot switch off a
|
||||
# protection the project kept on.
|
||||
#
|
||||
# With no root .mode present ROOT_MODE_FILE is either empty (root scope) or
|
||||
# names a missing file, so the effective token set is exactly the slug's and
|
||||
# existing projects are byte-identical.
|
||||
mode_has() {
|
||||
_mh_token="$1"
|
||||
if [ -f "$MODE_FILE" ] && grep -q "$_mh_token" "$MODE_FILE" 2>/dev/null; then
|
||||
return 0
|
||||
fi
|
||||
if [ -n "$ROOT_MODE_FILE" ] && [ -f "$ROOT_MODE_FILE" ] \
|
||||
&& grep -q "$_mh_token" "$ROOT_MODE_FILE" 2>/dev/null; then
|
||||
return 0
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
mode_relax_allowed() {
|
||||
_mr_token="$1"
|
||||
[ -f "$MODE_FILE" ] || return 1
|
||||
grep -q "$_mr_token" "$MODE_FILE" 2>/dev/null || return 1
|
||||
if [ -n "$ROOT_MODE_FILE" ] && [ -f "$ROOT_MODE_FILE" ]; then
|
||||
grep -q "$_mr_token" "$ROOT_MODE_FILE" 2>/dev/null || return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
MODE=""
|
||||
if [ -f "$MODE_FILE" ]; then
|
||||
grep -q 'autonomous' "$MODE_FILE" 2>/dev/null && MODE='autonomous'
|
||||
grep -q 'gate' "$MODE_FILE" 2>/dev/null && MODE='gated'
|
||||
fi
|
||||
mode_has 'autonomous' && MODE='autonomous'
|
||||
mode_has 'gate' && MODE='gated'
|
||||
|
||||
# In autonomous/gated mode the per-tool-call injection is dropped (recitation
|
||||
# policy): strong models do not need the plan re-recited before every tool call,
|
||||
@@ -859,7 +946,7 @@ fi
|
||||
SMART=0
|
||||
if [ "${PWF_INJECT:-}" = "smart" ]; then
|
||||
SMART=1
|
||||
elif [ -f "$MODE_FILE" ] && grep -q 'inject-smart' "$MODE_FILE" 2>/dev/null; then
|
||||
elif mode_has 'inject-smart'; then
|
||||
SMART=1
|
||||
fi
|
||||
|
||||
@@ -1127,7 +1214,7 @@ esac
|
||||
# holding the stale copy. Per-session keying needs PWF_SESSION_ID, which most
|
||||
# hosts never set.
|
||||
GUARD=1
|
||||
[ -f "$MODE_FILE" ] && grep -q 'plan-guard-off' "$MODE_FILE" 2>/dev/null && GUARD=0
|
||||
mode_relax_allowed 'plan-guard-off' && GUARD=0
|
||||
[ "${PWF_PLAN_GUARD:-}" = "0" ] && GUARD=0
|
||||
if [ "$GUARD" = "1" ]; then
|
||||
# Same user-private cache root and same absolute-path key as the attestation
|
||||
|
||||
@@ -68,6 +68,15 @@ if [ -n "${ARG_DIR}" ]; then
|
||||
elif [ -f "${RESOLVER}" ]; then
|
||||
PLAN_DIR="$(sh "${RESOLVER}" 2>/dev/null)"
|
||||
if [ -z "${PLAN_DIR}" ] || [ ! -d "${PLAN_DIR}" ]; then
|
||||
# Explicit selectors are bindings, not hints (issue #237). A rejected
|
||||
# PLAN_ID or PWF_PLAN_ROOT must not fall back to the cwd: this summary
|
||||
# is injected into autonomous turns, so reporting the ROOT plan's
|
||||
# phase counts under a mistyped pin feeds the loop another plan's
|
||||
# termination signal. Degrade loudly, the same way a missing resolver
|
||||
# already does.
|
||||
if [ -n "${PLAN_ID:-}" ] || [ -n "${PWF_PLAN_ROOT:-}" ]; then
|
||||
emit_unavailable "explicit PLAN_ID or PWF_PLAN_ROOT did not resolve"
|
||||
fi
|
||||
PLAN_DIR="."
|
||||
fi
|
||||
else
|
||||
|
||||
@@ -74,27 +74,49 @@ if [ -f "${INJ}" ]; then
|
||||
ok "injection: silent because no plan exists here (correct behavior)"
|
||||
fi
|
||||
else
|
||||
# Classify on the DATA FRAMING first, never on substrings of the whole
|
||||
# blob (issue #236). ${OUT} carries the plan body VERBATIM inside
|
||||
# ===BEGIN-PWF-DATA=== fences, so a bare substring test also matches
|
||||
# plan prose: a phase line reading "fix the false PLAN TAMPERED
|
||||
# warning" made the doctor report a hash mismatch on a correctly
|
||||
# attested plan.
|
||||
#
|
||||
# Every refusal path in inject-plan.sh prints its banner and exits
|
||||
# before frame_file runs, so a frame in the output proves injection
|
||||
# happened and rules out every refusal. Output WITHOUT a frame is by
|
||||
# construction a notice, which is why the banner arms sit under the
|
||||
# else side and the default arm warns instead of passing. A banner
|
||||
# whose wording drifts then degrades to a generic warning rather than
|
||||
# to a silent PASS: that is exactly how the stale
|
||||
# "PWF_PLAN_ROOT is not a directory" literal (which was never a
|
||||
# substring of what inject-plan.sh emits) reported PASS on a fully
|
||||
# dark-hooks state.
|
||||
case "${OUT}" in
|
||||
*'PLAN TAMPERED'*)
|
||||
*'===BEGIN-PWF-DATA'*)
|
||||
BYTES="$(printf '%s' "${OUT}" | wc -c | tr -d '[:space:]')"
|
||||
ok "injection: emits plan context (${BYTES} bytes)"
|
||||
;;
|
||||
*'[PLAN TAMPERED'*)
|
||||
warn "injection: plan is attested but the hash mismatches — run /plan-attest (or scripts/attest-plan.sh) to re-approve the current plan"
|
||||
;;
|
||||
*'requires attested plan'*)
|
||||
warn "injection: v3 mode without attestation — run attest-plan once to arm injection"
|
||||
;;
|
||||
*'Session isolation is armed'*)
|
||||
# Refusal notice, not plan context: reporting its byte count as
|
||||
# PASS told a dark user their hooks were fine.
|
||||
warn "injection: session isolation refuses this session — attach it with PWF_SESSION_ID=<id> plus .planning/sessions/<id>.attached, or delete the .planning/sessions/ dir (stale ones survive earlier Codex use and copied project trees) to turn isolation off"
|
||||
;;
|
||||
*'Ambiguous plan'*)
|
||||
warn "injection: nested-plan ambiguity — a project directly below this cwd carries its own plan, so hooks refuse to guess. Pin the thread with PWF_PLAN_ROOT=<absolute project root> or PLAN_ID=<slug>"
|
||||
;;
|
||||
*'PWF_PLAN_ROOT is not a directory'*)
|
||||
warn "injection: PWF_PLAN_ROOT points at a missing directory — fix or unset the pin; a broken pin fails closed and injects nothing"
|
||||
*'PWF_PLAN_ROOT is not a supported absolute local directory'*)
|
||||
warn "injection: PWF_PLAN_ROOT points at something that is not an absolute local directory — fix or unset the pin; a broken pin fails closed and injects nothing"
|
||||
;;
|
||||
*'PLAN_ID does not name a plan directory'*)
|
||||
warn "injection: PLAN_ID names no plan directory under .planning — fix or unset the pin; a set PLAN_ID is a binding and fails closed rather than selecting another plan"
|
||||
;;
|
||||
*)
|
||||
BYTES="$(printf '%s' "${OUT}" | wc -c | tr -d '[:space:]')"
|
||||
ok "injection: emits plan context (${BYTES} bytes)"
|
||||
warn "injection: inject-plan.sh emitted ${BYTES} bytes but no ===BEGIN-PWF-DATA frame, so no plan context reached the model. This is a refusal notice this doctor does not recognize; read it directly with: sh scripts/inject-plan.sh --context=userprompt"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
@@ -130,6 +130,13 @@ function Test-WithinRoot {
|
||||
|
||||
$activeFile = Join-Path $PlanRoot ".active_plan"
|
||||
|
||||
# A set PLAN_ID is a BINDING, not a hint (issue #237). A selector that names
|
||||
# no directory, fails slug validation, or fails containment terminates
|
||||
# resolution instead of falling through to .active_plan and newest-by-mtime:
|
||||
# the fall-through let a one-character typo attest and inject a DIFFERENT plan
|
||||
# at rc=0. Emptiness is the fail-closed signal on this channel, matching
|
||||
# resolve-plan-dir.sh and the PWF_PLAN_ROOT pin. An empty $env:PLAN_ID is
|
||||
# falsy here and still means "unset".
|
||||
if ($env:PLAN_ID) {
|
||||
if (Test-ValidSlug $env:PLAN_ID) {
|
||||
$candidate = Join-Path $PlanRoot $env:PLAN_ID
|
||||
@@ -138,16 +145,20 @@ if ($env:PLAN_ID) {
|
||||
exit 0
|
||||
}
|
||||
}
|
||||
exit 0
|
||||
}
|
||||
|
||||
if (Test-Path -LiteralPath $activeFile) {
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not $activeItem.PSIsContainer -and
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) {
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
} else {
|
||||
$planId = $null
|
||||
# Get-Item observes the link object even when its target is missing, unlike
|
||||
# Test-Path which follows the target. An active pointer that is a directory or
|
||||
# reparse point is an unsafe/ambiguous selector and must terminate resolution;
|
||||
# falling through would silently select and expose the newest unrelated plan.
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem) {
|
||||
if ($activeItem.PSIsContainer -or
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0)) {
|
||||
exit 0
|
||||
}
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
if ($planId -and (Test-ValidSlug $planId)) {
|
||||
$candidate = Join-Path $PlanRoot $planId
|
||||
if ((Test-Path $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
|
||||
|
||||
@@ -90,10 +90,54 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
@@ -105,12 +149,9 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -180,7 +221,8 @@ is_within_root() {
|
||||
}
|
||||
|
||||
# Portable mtime resolver. Tries GNU stat, BSD stat, BSD/macOS date -r,
|
||||
# python3, then perl. Returns "0" on full miss so callers can sort.
|
||||
# then an explicitly trusted Python interpreter. Returns "0" on a full miss
|
||||
# so newest-plan selection fails closed instead of executing from PATH.
|
||||
mtime_of() {
|
||||
target="$1"
|
||||
out="$(stat -c '%Y' "${target}" 2>/dev/null)"
|
||||
@@ -189,16 +231,9 @@ mtime_of() {
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
out="$(date -r "${target}" +%s 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
out="$(perl -e 'print((stat shift)[9])' "${target}" 2>/dev/null)"
|
||||
_mtime_python="$(trusted_python)" || _mtime_python=""
|
||||
if [ -n "${_mtime_python}" ]; then
|
||||
out="$("${_mtime_python}" -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
printf "0\n"
|
||||
@@ -262,7 +297,34 @@ resolve_latest_dir() {
|
||||
return 1
|
||||
}
|
||||
|
||||
if resolve_from_env; then exit 0; fi
|
||||
# A set PLAN_ID is a BINDING, not a hint (issue #237).
|
||||
#
|
||||
# resolve_from_env returns 1 both when no selector was set and when the
|
||||
# selector was rejected, so continuing the chain after it turned a
|
||||
# one-character typo into a silent switch: .active_plan or newest-by-mtime
|
||||
# answered instead, attest-plan.sh locked THAT plan at rc=0, and injection
|
||||
# followed the attestation onto it. commands/plan-attest.md already promised
|
||||
# the opposite ("It never falls back to another plan").
|
||||
#
|
||||
# Any non-empty PLAN_ID therefore terminates resolution here, whether it was
|
||||
# rejected for slug shape (traversal), for naming no directory, or for failing
|
||||
# containment. The caller receives an empty result and takes its own
|
||||
# fail-closed path rather than a different plan. PWF_PLAN_ROOT, the sibling
|
||||
# selector, has failed closed on any bad value since #212; the two selectors
|
||||
# now agree.
|
||||
#
|
||||
# An EMPTY PLAN_ID still means "unset": init-session.sh passes
|
||||
# PLAN_ID="${PLAN_ID:-}" into attest-plan.sh on the legacy path and depends on
|
||||
# that spelling resolving the root plan.
|
||||
#
|
||||
# Exit status stays 0 on the refusal (see the header contract). Emptiness is
|
||||
# the fail-closed signal on this channel, exactly as the PWF_PLAN_ROOT guard
|
||||
# above already does it; a non-zero status would kill callers running under
|
||||
# set -e for a condition that is not an internal error.
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
resolve_from_env && exit 0
|
||||
exit 0
|
||||
fi
|
||||
if resolve_from_active_file; then exit 0; fi
|
||||
if resolve_latest_dir; then exit 0; fi
|
||||
exit 0
|
||||
|
||||
@@ -36,7 +36,7 @@ hooks:
|
||||
- type: command
|
||||
command: "SH=\"\"; for c in \"${PWF_SCRIPT_DIR}/inject-plan.sh\" \"${CLAUDE_SKILL_DIR}/scripts/inject-plan.sh\" \"$HOME/.factory/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/inject-plan.sh\"; do [ -f \"$c\" ] && { SH=\"$c\"; break; }; done; [ -n \"$SH\" ] && sh \"$SH\" --context=precompact; exit 0"
|
||||
metadata:
|
||||
version: "3.12.0"
|
||||
version: "3.16.0"
|
||||
---
|
||||
|
||||
# Planning with Files
|
||||
|
||||
@@ -32,6 +32,9 @@ param(
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
if (-not $script:IsWindowsHost) {
|
||||
throw "Safe no-follow descriptor operations are unavailable in this PowerShell script on Unix. Use scripts/attest-plan.sh instead."
|
||||
}
|
||||
if ($script:IsWindowsHost -and -not ("PwfAttestationNative" -as [type])) {
|
||||
Add-Type -TypeDefinition @'
|
||||
using System;
|
||||
@@ -382,6 +385,21 @@ function Resolve-ContainedPlanFile {
|
||||
} catch { return $null }
|
||||
}
|
||||
|
||||
function Test-SlugPlanDirectory {
|
||||
param([string] $Directory)
|
||||
try {
|
||||
$finalDirectory = [PwfAttestationNative]::FinalDirectoryPath($Directory)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
$planningDirectory = Split-Path -Parent $finalDirectory
|
||||
$planId = Split-Path -Leaf $finalDirectory
|
||||
return (
|
||||
(Split-Path -Leaf $planningDirectory) -eq ".planning" -and
|
||||
$planId -match '^[A-Za-z0-9_][A-Za-z0-9._-]*$'
|
||||
)
|
||||
}
|
||||
|
||||
function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
@@ -395,10 +413,17 @@ function Resolve-PlanFile {
|
||||
# fall through and attest an unrelated legacy-root plan.
|
||||
if ($env:PWF_PLAN_ROOT -or $env:PLAN_ID) { return $null }
|
||||
$activePointer = Join-Path (Join-Path (Get-Location) ".planning") ".active_plan"
|
||||
if (Test-Path -LiteralPath $activePointer) { return $null }
|
||||
$activePointerItem = Get-Item -LiteralPath $activePointer -Force -ErrorAction SilentlyContinue
|
||||
if ($activePointerItem) { return $null }
|
||||
|
||||
$legacy = Join-Path (Get-Location) "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory (Get-Location).Path)
|
||||
$currentDirectory = (Get-Location).Path
|
||||
if (Test-SlugPlanDirectory $currentDirectory) {
|
||||
$slugPlan = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $slugPlan -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
$legacy = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
function Get-AttestationPath {
|
||||
@@ -406,6 +431,9 @@ function Get-AttestationPath {
|
||||
$planDir = Split-Path -Parent $PlanFile
|
||||
$cwd = (Get-Location).Path
|
||||
if ($planDir -eq $cwd) {
|
||||
if (Test-SlugPlanDirectory $cwd) {
|
||||
return (Join-Path $cwd ".attestation")
|
||||
}
|
||||
return (Join-Path $cwd ".plan-attestation")
|
||||
}
|
||||
return (Join-Path $planDir ".attestation")
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
# 1. $PLAN_ID env var → ./.planning/$PLAN_ID/
|
||||
# 2. ./.planning/.active_plan
|
||||
# 3. Newest ./.planning/<dir>/ by mtime
|
||||
# 4. Legacy ./task_plan.md at project root
|
||||
# 4. Current directory when it is .planning/<valid-slug>/
|
||||
# 5. Legacy ./task_plan.md at project root
|
||||
#
|
||||
# Usage:
|
||||
# sh scripts/attest-plan.sh # attest the active plan
|
||||
@@ -21,6 +22,25 @@ set -u
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
RESOLVER="${SCRIPT_DIR}/resolve-plan-dir.sh"
|
||||
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
resolve_from_slug_cwd() {
|
||||
slug_cwd="$(pwd -P 2>/dev/null)" || return 1
|
||||
planning_dir="${slug_cwd%/*}"
|
||||
[ "${planning_dir##*/}" = ".planning" ] || return 1
|
||||
plan_id="${slug_cwd##*/}"
|
||||
slug_is_valid "${plan_id}" || return 1
|
||||
[ -f "${slug_cwd}/task_plan.md" ] || return 1
|
||||
printf "%s\n" "${slug_cwd}/task_plan.md"
|
||||
}
|
||||
|
||||
resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
@@ -30,6 +50,22 @@ resolve_plan_file() {
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Explicit selectors are bindings, not hints. If the shared resolver
|
||||
# rejected one, do not attest a different plan through a cwd fallback.
|
||||
if [ -n "${PWF_PLAN_ROOT:-}" ] || [ -n "${PLAN_ID:-}" ]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
# An absolute script path does not change the invoking shell's cwd. When
|
||||
# that cwd is a slug plan directory, keep slug-mode storage semantics
|
||||
# instead of misclassifying its task_plan.md as a legacy root plan.
|
||||
slug_plan_file="$(resolve_from_slug_cwd)" || slug_plan_file=""
|
||||
if [ -n "${slug_plan_file}" ]; then
|
||||
printf "%s\n" "${slug_plan_file}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "./task_plan.md" ]; then
|
||||
printf "%s\n" "./task_plan.md"
|
||||
return 0
|
||||
@@ -72,7 +108,18 @@ case "${1:-}" in
|
||||
esac
|
||||
|
||||
plan_file="$(resolve_plan_file)" || {
|
||||
printf "[plan-attest] No task_plan.md found. Create a plan first.\n" >&2
|
||||
# Name the actual cause. "No task_plan.md found" is true but misleading
|
||||
# when the plan exists and an explicit selector was rejected: before #237
|
||||
# a mistyped PLAN_ID attested a DIFFERENT plan at rc=0, and an operator
|
||||
# who now sees a generic not-found is likely to go looking for the wrong
|
||||
# problem. The selectors are bindings, so say which one refused.
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
printf "[plan-attest] PLAN_ID=%s names no plan directory under .planning. An explicit selector is a binding: nothing was attested and no other plan was substituted.\n" "${PLAN_ID}" >&2
|
||||
elif [ -n "${PWF_PLAN_ROOT:-}" ]; then
|
||||
printf "[plan-attest] PWF_PLAN_ROOT=%s did not resolve to a project root holding a plan. An explicit pin is a binding: nothing was attested and no other plan was substituted.\n" "${PWF_PLAN_ROOT}" >&2
|
||||
else
|
||||
printf "[plan-attest] No task_plan.md found. Create a plan first.\n" >&2
|
||||
fi
|
||||
exit 1
|
||||
}
|
||||
|
||||
|
||||
@@ -107,13 +107,27 @@ if (-not $Gate) {
|
||||
|
||||
# ---- Gate path (-Gate). Resolves to advisory unless every guard says block. ----
|
||||
|
||||
# Guard 1: gated mode. The .mode file must contain "gate".
|
||||
# Guard 1: gated mode. A .mode file must contain "gate".
|
||||
#
|
||||
# The project's root .mode is a FLOOR, not a default that slug scope replaces
|
||||
# (issue #238). Reading only <plan-dir>\.mode let a slug plan with no .mode
|
||||
# drop a project-committed gate. "gate" from EITHER file arms the gate; a slug
|
||||
# may raise strictness, never lower it. In root scope $PlanDir already IS the
|
||||
# project root, so the second source is skipped and behavior is unchanged.
|
||||
$modeFile = Join-Path $PlanDir ".mode"
|
||||
$rootForMode = if ($env:PWF_PLAN_ROOT) { $env:PWF_PLAN_ROOT } else { "." }
|
||||
$rootModeFile = $null
|
||||
if ($PlanDir -ne $rootForMode -and $PlanDir -ne ".") {
|
||||
$rootModeFile = Join-Path $rootForMode ".mode"
|
||||
}
|
||||
$gatedMode = $false
|
||||
if (Test-Path $modeFile) {
|
||||
$modeContent = Get-Content $modeFile -Raw -ErrorAction SilentlyContinue
|
||||
foreach ($candidateMode in @($modeFile, $rootModeFile)) {
|
||||
if (-not $candidateMode) { continue }
|
||||
if (-not (Test-Path $candidateMode)) { continue }
|
||||
$modeContent = Get-Content $candidateMode -Raw -ErrorAction SilentlyContinue
|
||||
if ($null -ne $modeContent -and $modeContent -match "gate") {
|
||||
$gatedMode = $true
|
||||
break
|
||||
}
|
||||
}
|
||||
if (-not $gatedMode) {
|
||||
|
||||
@@ -60,6 +60,14 @@ else
|
||||
if [ -n "${RESOLVED_DIR}" ] && [ -f "${RESOLVED_DIR}/task_plan.md" ]; then
|
||||
PLAN_FILE="${RESOLVED_DIR}/task_plan.md"
|
||||
PLAN_DIR="${RESOLVED_DIR}"
|
||||
elif [ -n "${PLAN_ID:-}" ] || [ -n "${PWF_PLAN_ROOT:-}" ]; then
|
||||
# Explicit selectors are bindings, not hints (issue #237). The shared
|
||||
# resolver rejected one, so the legacy cwd fallback below must not run:
|
||||
# answering a mistyped pin with the ROOT plan's completion state is the
|
||||
# same wrong-plan harm the binding removes, and here it would decide
|
||||
# whether an autonomous run is allowed to stop.
|
||||
echo "[planning-with-files] An explicit PLAN_ID or PWF_PLAN_ROOT did not resolve to a plan; no completion state was read and no other plan was substituted."
|
||||
exit 0
|
||||
else
|
||||
PLAN_FILE="task_plan.md"
|
||||
PLAN_DIR="."
|
||||
@@ -131,10 +139,30 @@ fi
|
||||
|
||||
# ---- Gate path (--gate). Resolves to advisory unless every guard says block. ----
|
||||
|
||||
# Guard 1: gated mode. The .mode file must contain "gate". Absent or other
|
||||
# Guard 1: gated mode. A .mode file must contain "gate". Absent or other
|
||||
# content means advisory mode (legacy behavior preserved).
|
||||
#
|
||||
# The project's root .mode is a FLOOR, not a default that slug scope replaces
|
||||
# (issue #238). Reading only <plan-dir>/.mode let a slug plan with no .mode
|
||||
# drop a project-committed gate, the same way it dropped the attestation
|
||||
# requirement in inject-plan.sh. "gate" from EITHER file arms the gate; a slug
|
||||
# may raise strictness, never lower it. In root scope PLAN_DIR already IS the
|
||||
# project root, so the second source stays empty and behavior is unchanged.
|
||||
MODE_FILE="${PLAN_DIR}/.mode"
|
||||
if [ ! -f "${MODE_FILE}" ] || ! grep -q "gate" "${MODE_FILE}" 2>/dev/null; then
|
||||
ROOT_MODE_FILE=""
|
||||
_root_for_mode="${PWF_PLAN_ROOT:-.}"
|
||||
if [ "${PLAN_DIR}" != "${_root_for_mode}" ] && [ "${PLAN_DIR}" != "." ]; then
|
||||
ROOT_MODE_FILE="${_root_for_mode}/.mode"
|
||||
fi
|
||||
GATED=0
|
||||
if [ -f "${MODE_FILE}" ] && grep -q "gate" "${MODE_FILE}" 2>/dev/null; then
|
||||
GATED=1
|
||||
fi
|
||||
if [ "${GATED}" -eq 0 ] && [ -n "${ROOT_MODE_FILE}" ] && [ -f "${ROOT_MODE_FILE}" ] \
|
||||
&& grep -q "gate" "${ROOT_MODE_FILE}" 2>/dev/null; then
|
||||
GATED=1
|
||||
fi
|
||||
if [ "${GATED}" -eq 0 ]; then
|
||||
advisory_report
|
||||
exit 0
|
||||
fi
|
||||
|
||||
@@ -152,6 +152,33 @@ gen_nonce() {
|
||||
# $1 = plan dir (absolute or relative); dotfiles live directly inside it.
|
||||
# $2 = plan file path (task_plan.md) used for auto-attestation resolution.
|
||||
# No-op when MODE is empty (legacy path stays byte-equivalent to v2.43.0).
|
||||
# Raise MODE to the project's committed floor before the side effects run
|
||||
# (issue #238). A project that ships a root .mode has made that setting a
|
||||
# reviewed part of the repo; a new slug plan must not start below it. Without
|
||||
# this, `init-session.sh <name>` created a plan with no .mode at all, and the
|
||||
# project's attestation requirement became a flag the agent chose at plan
|
||||
# creation time.
|
||||
#
|
||||
# inject-plan.sh enforces the same floor at read time, so this is not the
|
||||
# guard. It exists so the effective policy is VISIBLE in the plan directory
|
||||
# rather than only inside the resolver, and so the new plan gets the nonce and
|
||||
# the auto-attestation that autonomous mode needs to inject at all.
|
||||
#
|
||||
# An explicit --autonomous/--gated is never lowered: gated stays gated.
|
||||
inherit_root_mode() {
|
||||
_root_mode="${PWD}/.mode"
|
||||
[ -f "${_root_mode}" ] || return 0
|
||||
[ "$MODE" = "gated" ] && return 0
|
||||
if grep -q 'gate' "${_root_mode}" 2>/dev/null; then
|
||||
MODE='gated'
|
||||
return 0
|
||||
fi
|
||||
if grep -q 'autonomous' "${_root_mode}" 2>/dev/null; then
|
||||
MODE='autonomous'
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
apply_v3_mode() {
|
||||
_mode_dir="$1"
|
||||
_mode_plan="$2"
|
||||
@@ -367,6 +394,7 @@ if [ "$SLUG_MODE" -eq 1 ]; then
|
||||
echo "PLAN_ID=$PLAN_ID"
|
||||
create_files_in "$PLAN_DIR"
|
||||
printf "%s\n" "$PLAN_ID" > "${PLAN_ROOT}/.active_plan"
|
||||
inherit_root_mode
|
||||
apply_v3_mode "$PLAN_DIR" "${PLAN_DIR}/task_plan.md"
|
||||
echo ""
|
||||
echo "Active plan recorded: ${PLAN_ROOT}/.active_plan"
|
||||
|
||||
@@ -27,27 +27,26 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Select a working interpreter, not merely the first executable name on PATH.
|
||||
# Validate candidate interpreters supplied by the selector wrappers below.
|
||||
# Windows Store app aliases can exist as python3.exe while refusing every
|
||||
# script invocation. Probe candidates privately and fail closed if none runs.
|
||||
select_python() {
|
||||
# PWF_TRUSTED_PYTHON is the explicit trust path. PYTHON_BIN remains a
|
||||
# compatibility alias. PATH discovery is a deliberate fallback: the hook
|
||||
# treats the caller's PATH as executable trust, but still requires the
|
||||
# resolved candidate to be an absolute regular executable.
|
||||
for _sp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}" "$(command -v python3 2>/dev/null)" "$(command -v python 2>/dev/null)"; do
|
||||
select_python_candidates() {
|
||||
for _sp_candidate in "$@"; do
|
||||
[ -n "$_sp_candidate" ] || continue
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
case "$_sp_candidate" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
# Git Bash cannot reliably test or invoke C:\... spelling.
|
||||
# Convert before every filesystem predicate and invocation.
|
||||
command -v cygpath >/dev/null 2>&1 || continue
|
||||
_sp_candidate="$(cygpath -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
# Convert with Git Bash's fixed system helper, never PATH.
|
||||
_sp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "$_sp_cygpath" ] && [ -x "$_sp_cygpath" ] || continue
|
||||
_sp_candidate="$("$_sp_cygpath" -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
[ -f "$_sp_candidate" ] || continue
|
||||
[ -x "$_sp_candidate" ] || continue
|
||||
if "$_sp_candidate" -c 'import sys; raise SystemExit(0 if sys.version_info >= (3, 8) else 1)' >/dev/null 2>&1; then
|
||||
@@ -58,6 +57,21 @@ select_python() {
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment may use only an interpreter path the caller explicitly trusted.
|
||||
select_explicit_python() {
|
||||
select_python_candidates "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"
|
||||
}
|
||||
|
||||
# After containment succeeds, PATH discovery remains a compatibility fallback
|
||||
# for hosts that do not export an interpreter path to direct hook invocations.
|
||||
select_python() {
|
||||
select_python_candidates \
|
||||
"${PWF_TRUSTED_PYTHON:-}" \
|
||||
"${PYTHON_BIN:-}" \
|
||||
"$(command -v python3 2>/dev/null)" \
|
||||
"$(command -v python 2>/dev/null)"
|
||||
}
|
||||
|
||||
# issue #195: per-invocation opt-out (PLANNING_DISABLED=1) for one-shot/CI
|
||||
# sessions that share a cwd with a plan but never opted into it.
|
||||
[ "${PLANNING_DISABLED:-}" = "1" ] && exit 0
|
||||
@@ -154,13 +168,24 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
# (Copied verbatim from resolve-plan-dir.sh so hook injection gets the same
|
||||
# symlink containment as the resolver — see security A1.3.)
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Matching is case-insensitive and works after slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils), then
|
||||
# readlink -f (older GNU), then the interpreter already validated by
|
||||
# select_python(). Prints the canonical absolute path on success; prints
|
||||
# nothing and returns 1 on a full miss so the caller can decide what to do.
|
||||
# The fallback must not rediscover or execute an unvalidated PATH interpreter.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
@@ -171,12 +196,8 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
if [ -n "${PWF_PYTHON:-}" ]; then
|
||||
out="$("${PWF_PYTHON}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -233,8 +254,28 @@ SCOPE=""
|
||||
EXPLICIT=0
|
||||
[ -n "$PLAN_PREFIX" ] && EXPLICIT=1
|
||||
[ "$SESSION_ATTACHED" = "1" ] && EXPLICIT=1
|
||||
if [ -n "${PLAN_ID:-}" ] && slug_is_valid "$PLAN_ID" && [ -d "${PLAN_PREFIX}.planning/${PLAN_ID}" ]; then
|
||||
RESOLVED="${PLAN_PREFIX}.planning/${PLAN_ID}"; SCOPE="scoped"; EXPLICIT=1
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
# A set PLAN_ID is a BINDING, not a hint (issue #237). This inline resolver
|
||||
# is the one the hooks actually run, so it carries the same rule as
|
||||
# resolve-plan-dir.sh: a selector that names no directory, fails slug
|
||||
# validation, or fails containment refuses instead of falling through to
|
||||
# .active_plan and newest-by-mtime. The fall-through is what let a
|
||||
# one-character typo inject a DIFFERENT plan while attest-plan.sh locked
|
||||
# that same wrong plan at rc=0.
|
||||
#
|
||||
# Unlike the PWF_PLAN_ROOT refusal above, the notice is userprompt-only.
|
||||
# pretool fires per tool call and precompact carries no plan body, so
|
||||
# printing on those would spam the transcript with the same line. The
|
||||
# userprompt fire is also the one plan-doctor.sh drives, so /plan-doctor
|
||||
# still sees and reports the state.
|
||||
if slug_is_valid "$PLAN_ID" && [ -d "${PLAN_PREFIX}.planning/${PLAN_ID}" ]; then
|
||||
RESOLVED="${PLAN_PREFIX}.planning/${PLAN_ID}"; SCOPE="scoped"; EXPLICIT=1
|
||||
else
|
||||
if [ "$CONTEXT" = "userprompt" ]; then
|
||||
echo "[planning-with-files] PLAN_ID does not name a plan directory under .planning: ${PLAN_ID} — nothing injected. Fix or unset the pin; a broken pin fails closed rather than selecting another plan."
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
elif [ -f "${PLAN_PREFIX}.planning/.active_plan" ]; then
|
||||
AP=$(tr -d '\r\n[:space:]' < "${PLAN_PREFIX}.planning/.active_plan" 2>/dev/null)
|
||||
if [ -n "$AP" ] && slug_is_valid "$AP" && [ -d "${PLAN_PREFIX}.planning/${AP}" ]; then
|
||||
@@ -256,9 +297,9 @@ fi
|
||||
if [ -z "$RESOLVED" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; then RESOLVED="${PLAN_PREFIX}."; SCOPE="root"; fi
|
||||
[ -z "$RESOLVED" ] && exit 0
|
||||
|
||||
# Do not probe or execute any interpreter until a real, contained plan exists.
|
||||
# This keeps opt-out and no-plan hook fires side-effect free even when an
|
||||
# untrusted PYTHON_BIN or PATH entry points at an executable canary.
|
||||
# Do not probe or execute any interpreter until a real plan exists. Before
|
||||
# containment, only an explicit PWF_TRUSTED_PYTHON or PYTHON_BIN may be used.
|
||||
# PATH discovery remains deferred until containment succeeds.
|
||||
if [ "$SCOPE" = "root" ]; then
|
||||
PRECHECK_PLAN_FILE="${PLAN_PREFIX}task_plan.md"
|
||||
else
|
||||
@@ -266,8 +307,9 @@ else
|
||||
fi
|
||||
[ -f "$PRECHECK_PLAN_FILE" ] || exit 0
|
||||
[ -L "$PRECHECK_PLAN_FILE" ] && exit 0
|
||||
PWF_PYTHON="$(select_explicit_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
is_within_root "$PRECHECK_PLAN_FILE" || exit 0
|
||||
PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
[ -n "$PWF_PYTHON" ] || PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
|
||||
# Session attachment is evaluated only after plan existence is proven. A
|
||||
# stale sessions directory without any plan must not cause interpreter probes.
|
||||
@@ -454,12 +496,16 @@ if [ "$SCOPE" = "root" ]; then
|
||||
PROGRESS_FILE="${PLAN_PREFIX}progress.md"
|
||||
ATTEST_FILE="${PLAN_PREFIX}.plan-attestation"
|
||||
MODE_FILE="${PLAN_PREFIX}.mode"
|
||||
ROOT_MODE_FILE=""
|
||||
NONCE_FILE="${PLAN_PREFIX}.nonce"
|
||||
else
|
||||
PLAN_FILE="${RESOLVED}/task_plan.md"
|
||||
PROGRESS_FILE="${RESOLVED}/progress.md"
|
||||
ATTEST_FILE="${RESOLVED}/.attestation"
|
||||
MODE_FILE="${RESOLVED}/.mode"
|
||||
# The project's own .mode, when it has one (issue #238). In root scope
|
||||
# MODE_FILE already IS that file, so the second source stays empty.
|
||||
ROOT_MODE_FILE="${PLAN_PREFIX}.mode"
|
||||
NONCE_FILE="${RESOLVED}/.nonce"
|
||||
fi
|
||||
[ -f "$PLAN_FILE" ] || exit 0
|
||||
@@ -831,11 +877,52 @@ fi
|
||||
# gated mode to legacy behavior (platform-critical: per-tool-call injection not
|
||||
# suppressed, oracle re-hash skipped, raw progress tail injected). Use a grep
|
||||
# token test, the same pattern check-complete.sh guard 1 uses.
|
||||
|
||||
# --- Root .mode is a FLOOR, not a default that slug scope replaces (#238). ---
|
||||
# A project makes attestation mandatory by committing a root .mode, which is a
|
||||
# reviewed project setting. Slug scope used to read ONLY the slug's .mode, and
|
||||
# init-session.sh writes no .mode unless --autonomous or --gated was passed, so
|
||||
# `init-session.sh <name>` produced a plan with no mode, no attestation
|
||||
# requirement and full injection: one agent-invocable command turned the
|
||||
# project's policy off.
|
||||
#
|
||||
# mode_has answers for a strictness-RAISING token: present in EITHER file. A
|
||||
# slug may opt into autonomous/gated where the root left it unset; it can no
|
||||
# longer opt out of what the root committed.
|
||||
#
|
||||
# mode_relax_allowed answers for the one strictness-LOWERING token
|
||||
# (plan-guard-off): the slug must carry it AND, when the project committed a
|
||||
# root .mode, that file must carry it too. A slug alone cannot switch off a
|
||||
# protection the project kept on.
|
||||
#
|
||||
# With no root .mode present ROOT_MODE_FILE is either empty (root scope) or
|
||||
# names a missing file, so the effective token set is exactly the slug's and
|
||||
# existing projects are byte-identical.
|
||||
mode_has() {
|
||||
_mh_token="$1"
|
||||
if [ -f "$MODE_FILE" ] && grep -q "$_mh_token" "$MODE_FILE" 2>/dev/null; then
|
||||
return 0
|
||||
fi
|
||||
if [ -n "$ROOT_MODE_FILE" ] && [ -f "$ROOT_MODE_FILE" ] \
|
||||
&& grep -q "$_mh_token" "$ROOT_MODE_FILE" 2>/dev/null; then
|
||||
return 0
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
mode_relax_allowed() {
|
||||
_mr_token="$1"
|
||||
[ -f "$MODE_FILE" ] || return 1
|
||||
grep -q "$_mr_token" "$MODE_FILE" 2>/dev/null || return 1
|
||||
if [ -n "$ROOT_MODE_FILE" ] && [ -f "$ROOT_MODE_FILE" ]; then
|
||||
grep -q "$_mr_token" "$ROOT_MODE_FILE" 2>/dev/null || return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
MODE=""
|
||||
if [ -f "$MODE_FILE" ]; then
|
||||
grep -q 'autonomous' "$MODE_FILE" 2>/dev/null && MODE='autonomous'
|
||||
grep -q 'gate' "$MODE_FILE" 2>/dev/null && MODE='gated'
|
||||
fi
|
||||
mode_has 'autonomous' && MODE='autonomous'
|
||||
mode_has 'gate' && MODE='gated'
|
||||
|
||||
# In autonomous/gated mode the per-tool-call injection is dropped (recitation
|
||||
# policy): strong models do not need the plan re-recited before every tool call,
|
||||
@@ -859,7 +946,7 @@ fi
|
||||
SMART=0
|
||||
if [ "${PWF_INJECT:-}" = "smart" ]; then
|
||||
SMART=1
|
||||
elif [ -f "$MODE_FILE" ] && grep -q 'inject-smart' "$MODE_FILE" 2>/dev/null; then
|
||||
elif mode_has 'inject-smart'; then
|
||||
SMART=1
|
||||
fi
|
||||
|
||||
@@ -1127,7 +1214,7 @@ esac
|
||||
# holding the stale copy. Per-session keying needs PWF_SESSION_ID, which most
|
||||
# hosts never set.
|
||||
GUARD=1
|
||||
[ -f "$MODE_FILE" ] && grep -q 'plan-guard-off' "$MODE_FILE" 2>/dev/null && GUARD=0
|
||||
mode_relax_allowed 'plan-guard-off' && GUARD=0
|
||||
[ "${PWF_PLAN_GUARD:-}" = "0" ] && GUARD=0
|
||||
if [ "$GUARD" = "1" ]; then
|
||||
# Same user-private cache root and same absolute-path key as the attestation
|
||||
|
||||
@@ -68,6 +68,15 @@ if [ -n "${ARG_DIR}" ]; then
|
||||
elif [ -f "${RESOLVER}" ]; then
|
||||
PLAN_DIR="$(sh "${RESOLVER}" 2>/dev/null)"
|
||||
if [ -z "${PLAN_DIR}" ] || [ ! -d "${PLAN_DIR}" ]; then
|
||||
# Explicit selectors are bindings, not hints (issue #237). A rejected
|
||||
# PLAN_ID or PWF_PLAN_ROOT must not fall back to the cwd: this summary
|
||||
# is injected into autonomous turns, so reporting the ROOT plan's
|
||||
# phase counts under a mistyped pin feeds the loop another plan's
|
||||
# termination signal. Degrade loudly, the same way a missing resolver
|
||||
# already does.
|
||||
if [ -n "${PLAN_ID:-}" ] || [ -n "${PWF_PLAN_ROOT:-}" ]; then
|
||||
emit_unavailable "explicit PLAN_ID or PWF_PLAN_ROOT did not resolve"
|
||||
fi
|
||||
PLAN_DIR="."
|
||||
fi
|
||||
else
|
||||
|
||||
@@ -74,27 +74,49 @@ if [ -f "${INJ}" ]; then
|
||||
ok "injection: silent because no plan exists here (correct behavior)"
|
||||
fi
|
||||
else
|
||||
# Classify on the DATA FRAMING first, never on substrings of the whole
|
||||
# blob (issue #236). ${OUT} carries the plan body VERBATIM inside
|
||||
# ===BEGIN-PWF-DATA=== fences, so a bare substring test also matches
|
||||
# plan prose: a phase line reading "fix the false PLAN TAMPERED
|
||||
# warning" made the doctor report a hash mismatch on a correctly
|
||||
# attested plan.
|
||||
#
|
||||
# Every refusal path in inject-plan.sh prints its banner and exits
|
||||
# before frame_file runs, so a frame in the output proves injection
|
||||
# happened and rules out every refusal. Output WITHOUT a frame is by
|
||||
# construction a notice, which is why the banner arms sit under the
|
||||
# else side and the default arm warns instead of passing. A banner
|
||||
# whose wording drifts then degrades to a generic warning rather than
|
||||
# to a silent PASS: that is exactly how the stale
|
||||
# "PWF_PLAN_ROOT is not a directory" literal (which was never a
|
||||
# substring of what inject-plan.sh emits) reported PASS on a fully
|
||||
# dark-hooks state.
|
||||
case "${OUT}" in
|
||||
*'PLAN TAMPERED'*)
|
||||
*'===BEGIN-PWF-DATA'*)
|
||||
BYTES="$(printf '%s' "${OUT}" | wc -c | tr -d '[:space:]')"
|
||||
ok "injection: emits plan context (${BYTES} bytes)"
|
||||
;;
|
||||
*'[PLAN TAMPERED'*)
|
||||
warn "injection: plan is attested but the hash mismatches — run /plan-attest (or scripts/attest-plan.sh) to re-approve the current plan"
|
||||
;;
|
||||
*'requires attested plan'*)
|
||||
warn "injection: v3 mode without attestation — run attest-plan once to arm injection"
|
||||
;;
|
||||
*'Session isolation is armed'*)
|
||||
# Refusal notice, not plan context: reporting its byte count as
|
||||
# PASS told a dark user their hooks were fine.
|
||||
warn "injection: session isolation refuses this session — attach it with PWF_SESSION_ID=<id> plus .planning/sessions/<id>.attached, or delete the .planning/sessions/ dir (stale ones survive earlier Codex use and copied project trees) to turn isolation off"
|
||||
;;
|
||||
*'Ambiguous plan'*)
|
||||
warn "injection: nested-plan ambiguity — a project directly below this cwd carries its own plan, so hooks refuse to guess. Pin the thread with PWF_PLAN_ROOT=<absolute project root> or PLAN_ID=<slug>"
|
||||
;;
|
||||
*'PWF_PLAN_ROOT is not a directory'*)
|
||||
warn "injection: PWF_PLAN_ROOT points at a missing directory — fix or unset the pin; a broken pin fails closed and injects nothing"
|
||||
*'PWF_PLAN_ROOT is not a supported absolute local directory'*)
|
||||
warn "injection: PWF_PLAN_ROOT points at something that is not an absolute local directory — fix or unset the pin; a broken pin fails closed and injects nothing"
|
||||
;;
|
||||
*'PLAN_ID does not name a plan directory'*)
|
||||
warn "injection: PLAN_ID names no plan directory under .planning — fix or unset the pin; a set PLAN_ID is a binding and fails closed rather than selecting another plan"
|
||||
;;
|
||||
*)
|
||||
BYTES="$(printf '%s' "${OUT}" | wc -c | tr -d '[:space:]')"
|
||||
ok "injection: emits plan context (${BYTES} bytes)"
|
||||
warn "injection: inject-plan.sh emitted ${BYTES} bytes but no ===BEGIN-PWF-DATA frame, so no plan context reached the model. This is a refusal notice this doctor does not recognize; read it directly with: sh scripts/inject-plan.sh --context=userprompt"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
@@ -130,6 +130,13 @@ function Test-WithinRoot {
|
||||
|
||||
$activeFile = Join-Path $PlanRoot ".active_plan"
|
||||
|
||||
# A set PLAN_ID is a BINDING, not a hint (issue #237). A selector that names
|
||||
# no directory, fails slug validation, or fails containment terminates
|
||||
# resolution instead of falling through to .active_plan and newest-by-mtime:
|
||||
# the fall-through let a one-character typo attest and inject a DIFFERENT plan
|
||||
# at rc=0. Emptiness is the fail-closed signal on this channel, matching
|
||||
# resolve-plan-dir.sh and the PWF_PLAN_ROOT pin. An empty $env:PLAN_ID is
|
||||
# falsy here and still means "unset".
|
||||
if ($env:PLAN_ID) {
|
||||
if (Test-ValidSlug $env:PLAN_ID) {
|
||||
$candidate = Join-Path $PlanRoot $env:PLAN_ID
|
||||
@@ -138,16 +145,20 @@ if ($env:PLAN_ID) {
|
||||
exit 0
|
||||
}
|
||||
}
|
||||
exit 0
|
||||
}
|
||||
|
||||
if (Test-Path -LiteralPath $activeFile) {
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not $activeItem.PSIsContainer -and
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) {
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
} else {
|
||||
$planId = $null
|
||||
# Get-Item observes the link object even when its target is missing, unlike
|
||||
# Test-Path which follows the target. An active pointer that is a directory or
|
||||
# reparse point is an unsafe/ambiguous selector and must terminate resolution;
|
||||
# falling through would silently select and expose the newest unrelated plan.
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem) {
|
||||
if ($activeItem.PSIsContainer -or
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0)) {
|
||||
exit 0
|
||||
}
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
if ($planId -and (Test-ValidSlug $planId)) {
|
||||
$candidate = Join-Path $PlanRoot $planId
|
||||
if ((Test-Path $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
|
||||
|
||||
@@ -90,10 +90,54 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
@@ -105,12 +149,9 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -180,7 +221,8 @@ is_within_root() {
|
||||
}
|
||||
|
||||
# Portable mtime resolver. Tries GNU stat, BSD stat, BSD/macOS date -r,
|
||||
# python3, then perl. Returns "0" on full miss so callers can sort.
|
||||
# then an explicitly trusted Python interpreter. Returns "0" on a full miss
|
||||
# so newest-plan selection fails closed instead of executing from PATH.
|
||||
mtime_of() {
|
||||
target="$1"
|
||||
out="$(stat -c '%Y' "${target}" 2>/dev/null)"
|
||||
@@ -189,16 +231,9 @@ mtime_of() {
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
out="$(date -r "${target}" +%s 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
out="$(perl -e 'print((stat shift)[9])' "${target}" 2>/dev/null)"
|
||||
_mtime_python="$(trusted_python)" || _mtime_python=""
|
||||
if [ -n "${_mtime_python}" ]; then
|
||||
out="$("${_mtime_python}" -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
printf "0\n"
|
||||
@@ -262,7 +297,34 @@ resolve_latest_dir() {
|
||||
return 1
|
||||
}
|
||||
|
||||
if resolve_from_env; then exit 0; fi
|
||||
# A set PLAN_ID is a BINDING, not a hint (issue #237).
|
||||
#
|
||||
# resolve_from_env returns 1 both when no selector was set and when the
|
||||
# selector was rejected, so continuing the chain after it turned a
|
||||
# one-character typo into a silent switch: .active_plan or newest-by-mtime
|
||||
# answered instead, attest-plan.sh locked THAT plan at rc=0, and injection
|
||||
# followed the attestation onto it. commands/plan-attest.md already promised
|
||||
# the opposite ("It never falls back to another plan").
|
||||
#
|
||||
# Any non-empty PLAN_ID therefore terminates resolution here, whether it was
|
||||
# rejected for slug shape (traversal), for naming no directory, or for failing
|
||||
# containment. The caller receives an empty result and takes its own
|
||||
# fail-closed path rather than a different plan. PWF_PLAN_ROOT, the sibling
|
||||
# selector, has failed closed on any bad value since #212; the two selectors
|
||||
# now agree.
|
||||
#
|
||||
# An EMPTY PLAN_ID still means "unset": init-session.sh passes
|
||||
# PLAN_ID="${PLAN_ID:-}" into attest-plan.sh on the legacy path and depends on
|
||||
# that spelling resolving the root plan.
|
||||
#
|
||||
# Exit status stays 0 on the refusal (see the header contract). Emptiness is
|
||||
# the fail-closed signal on this channel, exactly as the PWF_PLAN_ROOT guard
|
||||
# above already does it; a non-zero status would kill callers running under
|
||||
# set -e for a condition that is not an internal error.
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
resolve_from_env && exit 0
|
||||
exit 0
|
||||
fi
|
||||
if resolve_from_active_file; then exit 0; fi
|
||||
if resolve_latest_dir; then exit 0; fi
|
||||
exit 0
|
||||
|
||||
@@ -182,7 +182,7 @@ Helper scripts for automation:
|
||||
|
||||
- `scripts/init-session.sh` — Initialize planning files. With a name arg, creates an isolated plan under `.planning/YYYY-MM-DD-<slug>/` for parallel task workflows. Without args, writes `task_plan.md` at project root (legacy mode, backward-compatible).
|
||||
- `scripts/set-active-plan.sh` — Switch the active plan pointer (`.planning/.active_plan`). Run with a plan ID to switch; run without args to show which plan is current.
|
||||
- `scripts/resolve-plan-dir.sh` — Resolve the active plan directory. Checks `$PLAN_ID` env var first, then `.planning/.active_plan`, then newest plan dir by mtime, then falls back to project root (legacy). Used internally by hooks.
|
||||
- `scripts/resolve-plan-dir.sh` — Resolve the active plan directory. A set `$PLAN_ID` is a binding: it resolves or resolution stops, never another plan (issue #237). With no `$PLAN_ID`, checks `.planning/.active_plan`, then newest plan dir by mtime, then falls back to project root (legacy). Used internally by hooks.
|
||||
- `scripts/check-complete.sh` — Verify all phases in the active plan are complete.
|
||||
- `scripts/session-catchup.py`: Explicit same-project session-record aggregation or bounded replay (`--metadata` / `--replay`); bare invocation does not access host history. OpenCode uses its read-only SQLite store.
|
||||
- `scripts/attest-plan.sh` (and `.ps1`) — Lock the current `task_plan.md` content with a SHA-256 attestation (v2.37.0). Use `--show` to print the stored hash, `--clear` to remove the attestation.
|
||||
|
||||
@@ -32,6 +32,9 @@ param(
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
if (-not $script:IsWindowsHost) {
|
||||
throw "Safe no-follow descriptor operations are unavailable in this PowerShell script on Unix. Use scripts/attest-plan.sh instead."
|
||||
}
|
||||
if ($script:IsWindowsHost -and -not ("PwfAttestationNative" -as [type])) {
|
||||
Add-Type -TypeDefinition @'
|
||||
using System;
|
||||
@@ -382,6 +385,21 @@ function Resolve-ContainedPlanFile {
|
||||
} catch { return $null }
|
||||
}
|
||||
|
||||
function Test-SlugPlanDirectory {
|
||||
param([string] $Directory)
|
||||
try {
|
||||
$finalDirectory = [PwfAttestationNative]::FinalDirectoryPath($Directory)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
$planningDirectory = Split-Path -Parent $finalDirectory
|
||||
$planId = Split-Path -Leaf $finalDirectory
|
||||
return (
|
||||
(Split-Path -Leaf $planningDirectory) -eq ".planning" -and
|
||||
$planId -match '^[A-Za-z0-9_][A-Za-z0-9._-]*$'
|
||||
)
|
||||
}
|
||||
|
||||
function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
@@ -395,10 +413,17 @@ function Resolve-PlanFile {
|
||||
# fall through and attest an unrelated legacy-root plan.
|
||||
if ($env:PWF_PLAN_ROOT -or $env:PLAN_ID) { return $null }
|
||||
$activePointer = Join-Path (Join-Path (Get-Location) ".planning") ".active_plan"
|
||||
if (Test-Path -LiteralPath $activePointer) { return $null }
|
||||
$activePointerItem = Get-Item -LiteralPath $activePointer -Force -ErrorAction SilentlyContinue
|
||||
if ($activePointerItem) { return $null }
|
||||
|
||||
$legacy = Join-Path (Get-Location) "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory (Get-Location).Path)
|
||||
$currentDirectory = (Get-Location).Path
|
||||
if (Test-SlugPlanDirectory $currentDirectory) {
|
||||
$slugPlan = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $slugPlan -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
$legacy = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
function Get-AttestationPath {
|
||||
@@ -406,6 +431,9 @@ function Get-AttestationPath {
|
||||
$planDir = Split-Path -Parent $PlanFile
|
||||
$cwd = (Get-Location).Path
|
||||
if ($planDir -eq $cwd) {
|
||||
if (Test-SlugPlanDirectory $cwd) {
|
||||
return (Join-Path $cwd ".attestation")
|
||||
}
|
||||
return (Join-Path $cwd ".plan-attestation")
|
||||
}
|
||||
return (Join-Path $planDir ".attestation")
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
# 1. $PLAN_ID env var → ./.planning/$PLAN_ID/
|
||||
# 2. ./.planning/.active_plan
|
||||
# 3. Newest ./.planning/<dir>/ by mtime
|
||||
# 4. Legacy ./task_plan.md at project root
|
||||
# 4. Current directory when it is .planning/<valid-slug>/
|
||||
# 5. Legacy ./task_plan.md at project root
|
||||
#
|
||||
# Usage:
|
||||
# sh scripts/attest-plan.sh # attest the active plan
|
||||
@@ -21,6 +22,25 @@ set -u
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
RESOLVER="${SCRIPT_DIR}/resolve-plan-dir.sh"
|
||||
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
resolve_from_slug_cwd() {
|
||||
slug_cwd="$(pwd -P 2>/dev/null)" || return 1
|
||||
planning_dir="${slug_cwd%/*}"
|
||||
[ "${planning_dir##*/}" = ".planning" ] || return 1
|
||||
plan_id="${slug_cwd##*/}"
|
||||
slug_is_valid "${plan_id}" || return 1
|
||||
[ -f "${slug_cwd}/task_plan.md" ] || return 1
|
||||
printf "%s\n" "${slug_cwd}/task_plan.md"
|
||||
}
|
||||
|
||||
resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
@@ -30,6 +50,22 @@ resolve_plan_file() {
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Explicit selectors are bindings, not hints. If the shared resolver
|
||||
# rejected one, do not attest a different plan through a cwd fallback.
|
||||
if [ -n "${PWF_PLAN_ROOT:-}" ] || [ -n "${PLAN_ID:-}" ]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
# An absolute script path does not change the invoking shell's cwd. When
|
||||
# that cwd is a slug plan directory, keep slug-mode storage semantics
|
||||
# instead of misclassifying its task_plan.md as a legacy root plan.
|
||||
slug_plan_file="$(resolve_from_slug_cwd)" || slug_plan_file=""
|
||||
if [ -n "${slug_plan_file}" ]; then
|
||||
printf "%s\n" "${slug_plan_file}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "./task_plan.md" ]; then
|
||||
printf "%s\n" "./task_plan.md"
|
||||
return 0
|
||||
@@ -72,7 +108,18 @@ case "${1:-}" in
|
||||
esac
|
||||
|
||||
plan_file="$(resolve_plan_file)" || {
|
||||
printf "[plan-attest] No task_plan.md found. Create a plan first.\n" >&2
|
||||
# Name the actual cause. "No task_plan.md found" is true but misleading
|
||||
# when the plan exists and an explicit selector was rejected: before #237
|
||||
# a mistyped PLAN_ID attested a DIFFERENT plan at rc=0, and an operator
|
||||
# who now sees a generic not-found is likely to go looking for the wrong
|
||||
# problem. The selectors are bindings, so say which one refused.
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
printf "[plan-attest] PLAN_ID=%s names no plan directory under .planning. An explicit selector is a binding: nothing was attested and no other plan was substituted.\n" "${PLAN_ID}" >&2
|
||||
elif [ -n "${PWF_PLAN_ROOT:-}" ]; then
|
||||
printf "[plan-attest] PWF_PLAN_ROOT=%s did not resolve to a project root holding a plan. An explicit pin is a binding: nothing was attested and no other plan was substituted.\n" "${PWF_PLAN_ROOT}" >&2
|
||||
else
|
||||
printf "[plan-attest] No task_plan.md found. Create a plan first.\n" >&2
|
||||
fi
|
||||
exit 1
|
||||
}
|
||||
|
||||
|
||||
@@ -107,13 +107,27 @@ if (-not $Gate) {
|
||||
|
||||
# ---- Gate path (-Gate). Resolves to advisory unless every guard says block. ----
|
||||
|
||||
# Guard 1: gated mode. The .mode file must contain "gate".
|
||||
# Guard 1: gated mode. A .mode file must contain "gate".
|
||||
#
|
||||
# The project's root .mode is a FLOOR, not a default that slug scope replaces
|
||||
# (issue #238). Reading only <plan-dir>\.mode let a slug plan with no .mode
|
||||
# drop a project-committed gate. "gate" from EITHER file arms the gate; a slug
|
||||
# may raise strictness, never lower it. In root scope $PlanDir already IS the
|
||||
# project root, so the second source is skipped and behavior is unchanged.
|
||||
$modeFile = Join-Path $PlanDir ".mode"
|
||||
$rootForMode = if ($env:PWF_PLAN_ROOT) { $env:PWF_PLAN_ROOT } else { "." }
|
||||
$rootModeFile = $null
|
||||
if ($PlanDir -ne $rootForMode -and $PlanDir -ne ".") {
|
||||
$rootModeFile = Join-Path $rootForMode ".mode"
|
||||
}
|
||||
$gatedMode = $false
|
||||
if (Test-Path $modeFile) {
|
||||
$modeContent = Get-Content $modeFile -Raw -ErrorAction SilentlyContinue
|
||||
foreach ($candidateMode in @($modeFile, $rootModeFile)) {
|
||||
if (-not $candidateMode) { continue }
|
||||
if (-not (Test-Path $candidateMode)) { continue }
|
||||
$modeContent = Get-Content $candidateMode -Raw -ErrorAction SilentlyContinue
|
||||
if ($null -ne $modeContent -and $modeContent -match "gate") {
|
||||
$gatedMode = $true
|
||||
break
|
||||
}
|
||||
}
|
||||
if (-not $gatedMode) {
|
||||
|
||||
@@ -60,6 +60,14 @@ else
|
||||
if [ -n "${RESOLVED_DIR}" ] && [ -f "${RESOLVED_DIR}/task_plan.md" ]; then
|
||||
PLAN_FILE="${RESOLVED_DIR}/task_plan.md"
|
||||
PLAN_DIR="${RESOLVED_DIR}"
|
||||
elif [ -n "${PLAN_ID:-}" ] || [ -n "${PWF_PLAN_ROOT:-}" ]; then
|
||||
# Explicit selectors are bindings, not hints (issue #237). The shared
|
||||
# resolver rejected one, so the legacy cwd fallback below must not run:
|
||||
# answering a mistyped pin with the ROOT plan's completion state is the
|
||||
# same wrong-plan harm the binding removes, and here it would decide
|
||||
# whether an autonomous run is allowed to stop.
|
||||
echo "[planning-with-files] An explicit PLAN_ID or PWF_PLAN_ROOT did not resolve to a plan; no completion state was read and no other plan was substituted."
|
||||
exit 0
|
||||
else
|
||||
PLAN_FILE="task_plan.md"
|
||||
PLAN_DIR="."
|
||||
@@ -131,10 +139,30 @@ fi
|
||||
|
||||
# ---- Gate path (--gate). Resolves to advisory unless every guard says block. ----
|
||||
|
||||
# Guard 1: gated mode. The .mode file must contain "gate". Absent or other
|
||||
# Guard 1: gated mode. A .mode file must contain "gate". Absent or other
|
||||
# content means advisory mode (legacy behavior preserved).
|
||||
#
|
||||
# The project's root .mode is a FLOOR, not a default that slug scope replaces
|
||||
# (issue #238). Reading only <plan-dir>/.mode let a slug plan with no .mode
|
||||
# drop a project-committed gate, the same way it dropped the attestation
|
||||
# requirement in inject-plan.sh. "gate" from EITHER file arms the gate; a slug
|
||||
# may raise strictness, never lower it. In root scope PLAN_DIR already IS the
|
||||
# project root, so the second source stays empty and behavior is unchanged.
|
||||
MODE_FILE="${PLAN_DIR}/.mode"
|
||||
if [ ! -f "${MODE_FILE}" ] || ! grep -q "gate" "${MODE_FILE}" 2>/dev/null; then
|
||||
ROOT_MODE_FILE=""
|
||||
_root_for_mode="${PWF_PLAN_ROOT:-.}"
|
||||
if [ "${PLAN_DIR}" != "${_root_for_mode}" ] && [ "${PLAN_DIR}" != "." ]; then
|
||||
ROOT_MODE_FILE="${_root_for_mode}/.mode"
|
||||
fi
|
||||
GATED=0
|
||||
if [ -f "${MODE_FILE}" ] && grep -q "gate" "${MODE_FILE}" 2>/dev/null; then
|
||||
GATED=1
|
||||
fi
|
||||
if [ "${GATED}" -eq 0 ] && [ -n "${ROOT_MODE_FILE}" ] && [ -f "${ROOT_MODE_FILE}" ] \
|
||||
&& grep -q "gate" "${ROOT_MODE_FILE}" 2>/dev/null; then
|
||||
GATED=1
|
||||
fi
|
||||
if [ "${GATED}" -eq 0 ]; then
|
||||
advisory_report
|
||||
exit 0
|
||||
fi
|
||||
|
||||
@@ -152,6 +152,33 @@ gen_nonce() {
|
||||
# $1 = plan dir (absolute or relative); dotfiles live directly inside it.
|
||||
# $2 = plan file path (task_plan.md) used for auto-attestation resolution.
|
||||
# No-op when MODE is empty (legacy path stays byte-equivalent to v2.43.0).
|
||||
# Raise MODE to the project's committed floor before the side effects run
|
||||
# (issue #238). A project that ships a root .mode has made that setting a
|
||||
# reviewed part of the repo; a new slug plan must not start below it. Without
|
||||
# this, `init-session.sh <name>` created a plan with no .mode at all, and the
|
||||
# project's attestation requirement became a flag the agent chose at plan
|
||||
# creation time.
|
||||
#
|
||||
# inject-plan.sh enforces the same floor at read time, so this is not the
|
||||
# guard. It exists so the effective policy is VISIBLE in the plan directory
|
||||
# rather than only inside the resolver, and so the new plan gets the nonce and
|
||||
# the auto-attestation that autonomous mode needs to inject at all.
|
||||
#
|
||||
# An explicit --autonomous/--gated is never lowered: gated stays gated.
|
||||
inherit_root_mode() {
|
||||
_root_mode="${PWD}/.mode"
|
||||
[ -f "${_root_mode}" ] || return 0
|
||||
[ "$MODE" = "gated" ] && return 0
|
||||
if grep -q 'gate' "${_root_mode}" 2>/dev/null; then
|
||||
MODE='gated'
|
||||
return 0
|
||||
fi
|
||||
if grep -q 'autonomous' "${_root_mode}" 2>/dev/null; then
|
||||
MODE='autonomous'
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
apply_v3_mode() {
|
||||
_mode_dir="$1"
|
||||
_mode_plan="$2"
|
||||
@@ -367,6 +394,7 @@ if [ "$SLUG_MODE" -eq 1 ]; then
|
||||
echo "PLAN_ID=$PLAN_ID"
|
||||
create_files_in "$PLAN_DIR"
|
||||
printf "%s\n" "$PLAN_ID" > "${PLAN_ROOT}/.active_plan"
|
||||
inherit_root_mode
|
||||
apply_v3_mode "$PLAN_DIR" "${PLAN_DIR}/task_plan.md"
|
||||
echo ""
|
||||
echo "Active plan recorded: ${PLAN_ROOT}/.active_plan"
|
||||
|
||||
@@ -74,27 +74,49 @@ if [ -f "${INJ}" ]; then
|
||||
ok "injection: silent because no plan exists here (correct behavior)"
|
||||
fi
|
||||
else
|
||||
# Classify on the DATA FRAMING first, never on substrings of the whole
|
||||
# blob (issue #236). ${OUT} carries the plan body VERBATIM inside
|
||||
# ===BEGIN-PWF-DATA=== fences, so a bare substring test also matches
|
||||
# plan prose: a phase line reading "fix the false PLAN TAMPERED
|
||||
# warning" made the doctor report a hash mismatch on a correctly
|
||||
# attested plan.
|
||||
#
|
||||
# Every refusal path in inject-plan.sh prints its banner and exits
|
||||
# before frame_file runs, so a frame in the output proves injection
|
||||
# happened and rules out every refusal. Output WITHOUT a frame is by
|
||||
# construction a notice, which is why the banner arms sit under the
|
||||
# else side and the default arm warns instead of passing. A banner
|
||||
# whose wording drifts then degrades to a generic warning rather than
|
||||
# to a silent PASS: that is exactly how the stale
|
||||
# "PWF_PLAN_ROOT is not a directory" literal (which was never a
|
||||
# substring of what inject-plan.sh emits) reported PASS on a fully
|
||||
# dark-hooks state.
|
||||
case "${OUT}" in
|
||||
*'PLAN TAMPERED'*)
|
||||
*'===BEGIN-PWF-DATA'*)
|
||||
BYTES="$(printf '%s' "${OUT}" | wc -c | tr -d '[:space:]')"
|
||||
ok "injection: emits plan context (${BYTES} bytes)"
|
||||
;;
|
||||
*'[PLAN TAMPERED'*)
|
||||
warn "injection: plan is attested but the hash mismatches — run /plan-attest (or scripts/attest-plan.sh) to re-approve the current plan"
|
||||
;;
|
||||
*'requires attested plan'*)
|
||||
warn "injection: v3 mode without attestation — run attest-plan once to arm injection"
|
||||
;;
|
||||
*'Session isolation is armed'*)
|
||||
# Refusal notice, not plan context: reporting its byte count as
|
||||
# PASS told a dark user their hooks were fine.
|
||||
warn "injection: session isolation refuses this session — attach it with PWF_SESSION_ID=<id> plus .planning/sessions/<id>.attached, or delete the .planning/sessions/ dir (stale ones survive earlier Codex use and copied project trees) to turn isolation off"
|
||||
;;
|
||||
*'Ambiguous plan'*)
|
||||
warn "injection: nested-plan ambiguity — a project directly below this cwd carries its own plan, so hooks refuse to guess. Pin the thread with PWF_PLAN_ROOT=<absolute project root> or PLAN_ID=<slug>"
|
||||
;;
|
||||
*'PWF_PLAN_ROOT is not a directory'*)
|
||||
warn "injection: PWF_PLAN_ROOT points at a missing directory — fix or unset the pin; a broken pin fails closed and injects nothing"
|
||||
*'PWF_PLAN_ROOT is not a supported absolute local directory'*)
|
||||
warn "injection: PWF_PLAN_ROOT points at something that is not an absolute local directory — fix or unset the pin; a broken pin fails closed and injects nothing"
|
||||
;;
|
||||
*'PLAN_ID does not name a plan directory'*)
|
||||
warn "injection: PLAN_ID names no plan directory under .planning — fix or unset the pin; a set PLAN_ID is a binding and fails closed rather than selecting another plan"
|
||||
;;
|
||||
*)
|
||||
BYTES="$(printf '%s' "${OUT}" | wc -c | tr -d '[:space:]')"
|
||||
ok "injection: emits plan context (${BYTES} bytes)"
|
||||
warn "injection: inject-plan.sh emitted ${BYTES} bytes but no ===BEGIN-PWF-DATA frame, so no plan context reached the model. This is a refusal notice this doctor does not recognize; read it directly with: sh scripts/inject-plan.sh --context=userprompt"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
@@ -130,6 +130,13 @@ function Test-WithinRoot {
|
||||
|
||||
$activeFile = Join-Path $PlanRoot ".active_plan"
|
||||
|
||||
# A set PLAN_ID is a BINDING, not a hint (issue #237). A selector that names
|
||||
# no directory, fails slug validation, or fails containment terminates
|
||||
# resolution instead of falling through to .active_plan and newest-by-mtime:
|
||||
# the fall-through let a one-character typo attest and inject a DIFFERENT plan
|
||||
# at rc=0. Emptiness is the fail-closed signal on this channel, matching
|
||||
# resolve-plan-dir.sh and the PWF_PLAN_ROOT pin. An empty $env:PLAN_ID is
|
||||
# falsy here and still means "unset".
|
||||
if ($env:PLAN_ID) {
|
||||
if (Test-ValidSlug $env:PLAN_ID) {
|
||||
$candidate = Join-Path $PlanRoot $env:PLAN_ID
|
||||
@@ -138,16 +145,20 @@ if ($env:PLAN_ID) {
|
||||
exit 0
|
||||
}
|
||||
}
|
||||
exit 0
|
||||
}
|
||||
|
||||
if (Test-Path -LiteralPath $activeFile) {
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not $activeItem.PSIsContainer -and
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) {
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
} else {
|
||||
$planId = $null
|
||||
# Get-Item observes the link object even when its target is missing, unlike
|
||||
# Test-Path which follows the target. An active pointer that is a directory or
|
||||
# reparse point is an unsafe/ambiguous selector and must terminate resolution;
|
||||
# falling through would silently select and expose the newest unrelated plan.
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem) {
|
||||
if ($activeItem.PSIsContainer -or
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0)) {
|
||||
exit 0
|
||||
}
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
if ($planId -and (Test-ValidSlug $planId)) {
|
||||
$candidate = Join-Path $PlanRoot $planId
|
||||
if ((Test-Path $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
|
||||
|
||||
@@ -90,10 +90,54 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
@@ -105,12 +149,9 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -180,7 +221,8 @@ is_within_root() {
|
||||
}
|
||||
|
||||
# Portable mtime resolver. Tries GNU stat, BSD stat, BSD/macOS date -r,
|
||||
# python3, then perl. Returns "0" on full miss so callers can sort.
|
||||
# then an explicitly trusted Python interpreter. Returns "0" on a full miss
|
||||
# so newest-plan selection fails closed instead of executing from PATH.
|
||||
mtime_of() {
|
||||
target="$1"
|
||||
out="$(stat -c '%Y' "${target}" 2>/dev/null)"
|
||||
@@ -189,16 +231,9 @@ mtime_of() {
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
out="$(date -r "${target}" +%s 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
out="$(perl -e 'print((stat shift)[9])' "${target}" 2>/dev/null)"
|
||||
_mtime_python="$(trusted_python)" || _mtime_python=""
|
||||
if [ -n "${_mtime_python}" ]; then
|
||||
out="$("${_mtime_python}" -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
printf "0\n"
|
||||
@@ -262,7 +297,34 @@ resolve_latest_dir() {
|
||||
return 1
|
||||
}
|
||||
|
||||
if resolve_from_env; then exit 0; fi
|
||||
# A set PLAN_ID is a BINDING, not a hint (issue #237).
|
||||
#
|
||||
# resolve_from_env returns 1 both when no selector was set and when the
|
||||
# selector was rejected, so continuing the chain after it turned a
|
||||
# one-character typo into a silent switch: .active_plan or newest-by-mtime
|
||||
# answered instead, attest-plan.sh locked THAT plan at rc=0, and injection
|
||||
# followed the attestation onto it. commands/plan-attest.md already promised
|
||||
# the opposite ("It never falls back to another plan").
|
||||
#
|
||||
# Any non-empty PLAN_ID therefore terminates resolution here, whether it was
|
||||
# rejected for slug shape (traversal), for naming no directory, or for failing
|
||||
# containment. The caller receives an empty result and takes its own
|
||||
# fail-closed path rather than a different plan. PWF_PLAN_ROOT, the sibling
|
||||
# selector, has failed closed on any bad value since #212; the two selectors
|
||||
# now agree.
|
||||
#
|
||||
# An EMPTY PLAN_ID still means "unset": init-session.sh passes
|
||||
# PLAN_ID="${PLAN_ID:-}" into attest-plan.sh on the legacy path and depends on
|
||||
# that spelling resolving the root plan.
|
||||
#
|
||||
# Exit status stays 0 on the refusal (see the header contract). Emptiness is
|
||||
# the fail-closed signal on this channel, exactly as the PWF_PLAN_ROOT guard
|
||||
# above already does it; a non-zero status would kill callers running under
|
||||
# set -e for a condition that is not an internal error.
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
resolve_from_env && exit 0
|
||||
exit 0
|
||||
fi
|
||||
if resolve_from_active_file; then exit 0; fi
|
||||
if resolve_latest_dir; then exit 0; fi
|
||||
exit 0
|
||||
|
||||
@@ -65,3 +65,24 @@ jobs:
|
||||
run: npm ci --no-audit --no-fund
|
||||
- name: Run vitest
|
||||
run: npm test
|
||||
|
||||
vitest-opencode:
|
||||
name: vitest (OpenCode plugin)
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 10
|
||||
defaults:
|
||||
run:
|
||||
working-directory: .opencode/packages/opencode-planning-with-files
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: "22"
|
||||
cache: npm
|
||||
cache-dependency-path: .opencode/packages/opencode-planning-with-files/package-lock.json
|
||||
- name: Install dependencies
|
||||
run: npm ci --no-audit --no-fund
|
||||
- name: Typecheck and build
|
||||
run: npm run build
|
||||
- name: Run vitest
|
||||
run: npm test
|
||||
|
||||
@@ -63,3 +63,9 @@ node_modules/
|
||||
|
||||
# v3 large banner exceeds GitHub's 100MB hard limit and stays local permanently
|
||||
media/v3-banner-large.png
|
||||
|
||||
# OpenCode: bun installs plugin deps next to .opencode/package.json; the
|
||||
# plugin package keeps its own tracked package-lock.json and builds to dist/.
|
||||
.opencode/package-lock.json
|
||||
.opencode/bun.lock
|
||||
.opencode/packages/*/dist/
|
||||
|
||||
@@ -1,14 +1,155 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import shlex
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
from .hooks import post_tool_call, pre_llm_call
|
||||
from .hooks import post_tool_call, pre_llm_call, pre_verify
|
||||
from .paths import normalize_cwd, plugin_skill_dir
|
||||
from .tools import (
|
||||
planning_with_files_check_complete,
|
||||
planning_with_files_init,
|
||||
planning_with_files_status,
|
||||
)
|
||||
|
||||
SLASH_COMMANDS = ("pwf", "pwf-status", "plan-status")
|
||||
|
||||
|
||||
def _command_cwd() -> Path:
|
||||
"""Project directory for a slash command: the Hermes session cwd, else the process cwd."""
|
||||
try:
|
||||
from agent.runtime_cwd import resolve_agent_cwd
|
||||
|
||||
candidate = resolve_agent_cwd()
|
||||
if isinstance(candidate, Path) and candidate.is_dir():
|
||||
return normalize_cwd(str(candidate))
|
||||
except Exception: # noqa: BLE001 - any runtime failure falls back to the process cwd
|
||||
pass
|
||||
return normalize_cwd()
|
||||
|
||||
|
||||
def _format_status(payload: dict[str, Any]) -> str:
|
||||
if not payload.get("exists"):
|
||||
return payload.get("message", "No planning files found.")
|
||||
counts = payload.get("counts") or {}
|
||||
lines = [
|
||||
f"planning-with-files status ({payload.get('plan_id', 'root')}, {payload.get('mode', 'legacy')} mode"
|
||||
f"{', attested' if payload.get('attested') else ''})",
|
||||
f" plan: {payload.get('plan_dir', '')}",
|
||||
f" current phase: {payload.get('current_phase', '')}",
|
||||
" phases: {complete}/{total} complete, {in_progress} in_progress, {pending} pending".format(
|
||||
complete=counts.get("complete", 0),
|
||||
total=counts.get("total", 0),
|
||||
in_progress=counts.get("in_progress", 0),
|
||||
pending=counts.get("pending", 0),
|
||||
),
|
||||
f" errors logged: {payload.get('errors_logged', 0)}",
|
||||
]
|
||||
return "\n".join(lines)
|
||||
|
||||
|
||||
def pwf_command(raw_args: str = "") -> str:
|
||||
"""/pwf [--autonomous|--gated] [--template analytics] [plan name]"""
|
||||
try:
|
||||
tokens = shlex.split(raw_args or "")
|
||||
except ValueError:
|
||||
tokens = (raw_args or "").split()
|
||||
mode = ""
|
||||
template = "default"
|
||||
name_parts: list[str] = []
|
||||
index = 0
|
||||
while index < len(tokens):
|
||||
token = tokens[index]
|
||||
if token in {"--autonomous", "-a"}:
|
||||
mode = mode or "autonomous"
|
||||
elif token in {"--gated", "-g"}:
|
||||
mode = "gated"
|
||||
elif token in {"--template", "-t"} and index + 1 < len(tokens):
|
||||
template = tokens[index + 1]
|
||||
index += 1
|
||||
elif token.startswith("--template="):
|
||||
template = token.split("=", 1)[1]
|
||||
elif token in {"--help", "-h"}:
|
||||
return (
|
||||
"Usage: /pwf [--autonomous|--gated] [--template analytics] [plan name]\n"
|
||||
"Creates task_plan.md, findings.md and progress.md (root mode), or an isolated\n"
|
||||
".planning/YYYY-MM-DD-<slug>/ directory when a plan name is given. The v3 flags\n"
|
||||
"write the mode marker, a nonce and the plan attestation. Existing files are kept."
|
||||
)
|
||||
else:
|
||||
name_parts.append(token)
|
||||
index += 1
|
||||
project_dir = _command_cwd()
|
||||
result = json.loads(
|
||||
planning_with_files_init(
|
||||
template=template, cwd=str(project_dir), name=" ".join(name_parts), mode=mode
|
||||
)
|
||||
)
|
||||
if not result.get("ok", True):
|
||||
return f"planning-with-files: {result.get('error', 'initialization failed')}"
|
||||
created = ", ".join(result.get("created") or []) or "none (all present)"
|
||||
lines = [
|
||||
f"planning-with-files: plan ready ({result.get('plan_id', 'root')}, {result.get('mode', 'legacy')} mode)",
|
||||
f" directory: {result.get('plan_dir', '')}",
|
||||
f" created: {created}",
|
||||
]
|
||||
if result.get("attestation"):
|
||||
lines.append(f" attested: sha256 {result['attestation'][:12]}...")
|
||||
lines.append(" next: read task_plan.md, findings.md and progress.md, then fill in the goal and phases.")
|
||||
return "\n".join(lines)
|
||||
|
||||
|
||||
def status_command(raw_args: str = "") -> str:
|
||||
"""/pwf-status and /plan-status: compact planning state for the current project."""
|
||||
project_dir = _command_cwd()
|
||||
payload = json.loads(planning_with_files_status(cwd=str(project_dir)))
|
||||
return _format_status(payload)
|
||||
|
||||
|
||||
def _register_commands(ctx: Any) -> None:
|
||||
register = getattr(ctx, "register_command", None)
|
||||
if register is None:
|
||||
return
|
||||
try:
|
||||
register(
|
||||
name="pwf",
|
||||
handler=pwf_command,
|
||||
description="Start planning-with-files: create the plan files (root or .planning/<slug>), optional --autonomous / --gated",
|
||||
args_hint="[--gated] [plan name]",
|
||||
)
|
||||
register(
|
||||
name="pwf-status",
|
||||
handler=status_command,
|
||||
description="Show the active planning-with-files plan: phase counts, mode, attestation",
|
||||
)
|
||||
register(
|
||||
name="plan-status",
|
||||
handler=status_command,
|
||||
description="Alias of /pwf-status",
|
||||
)
|
||||
except Exception: # noqa: BLE001 - a host without slash-command support must not lose the tools
|
||||
return
|
||||
|
||||
|
||||
def _register_skill(ctx: Any) -> None:
|
||||
register = getattr(ctx, "register_skill", None)
|
||||
if register is None:
|
||||
return
|
||||
try:
|
||||
skill_root = plugin_skill_dir()
|
||||
if skill_root is None:
|
||||
return
|
||||
skill_md = skill_root / "SKILL.md"
|
||||
if skill_md.is_file():
|
||||
register(
|
||||
name="planning-with-files",
|
||||
path=skill_md,
|
||||
description="Persistent file-based planning workflow (task_plan.md, findings.md, progress.md)",
|
||||
)
|
||||
except Exception: # noqa: BLE001 - bundled skill registration is best effort
|
||||
return
|
||||
|
||||
|
||||
def register(ctx: Any) -> None:
|
||||
ctx.register_tool(
|
||||
@@ -16,18 +157,26 @@ def register(ctx: Any) -> None:
|
||||
toolset="terminal",
|
||||
schema={
|
||||
"name": "planning_with_files_init",
|
||||
"description": "Create planning-with-files markdown files in the current project directory.",
|
||||
"description": (
|
||||
"Create planning-with-files markdown files (task_plan.md, findings.md, progress.md) "
|
||||
"in the current project. Pass a name to create an isolated .planning/<date>-<slug>/ plan; "
|
||||
"pass mode autonomous or gated to enable the v3 modes with attestation."
|
||||
),
|
||||
"parameters": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"template": {"type": "string", "description": "Template name, e.g. default or analytics."},
|
||||
"cwd": {"type": "string", "description": "Target project directory. Defaults to current working directory."},
|
||||
"name": {"type": "string", "description": "Optional plan name; creates .planning/YYYY-MM-DD-<slug>/ and sets it active."},
|
||||
"mode": {"type": "string", "description": "Optional v3 mode: autonomous or gated. Empty keeps legacy behavior."},
|
||||
},
|
||||
},
|
||||
},
|
||||
handler=lambda args, **kw: planning_with_files_init(
|
||||
template=args.get("template", "default"),
|
||||
cwd=args.get("cwd", ""),
|
||||
name=args.get("name", ""),
|
||||
mode=args.get("mode", ""),
|
||||
),
|
||||
description="Initialize planning-with-files state files.",
|
||||
)
|
||||
@@ -36,7 +185,7 @@ def register(ctx: Any) -> None:
|
||||
toolset="terminal",
|
||||
schema={
|
||||
"name": "planning_with_files_status",
|
||||
"description": "Summarize current planning file status for the active project.",
|
||||
"description": "Summarize current planning file status for the active project (slug or root plan).",
|
||||
"parameters": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
@@ -52,7 +201,7 @@ def register(ctx: Any) -> None:
|
||||
toolset="terminal",
|
||||
schema={
|
||||
"name": "planning_with_files_check_complete",
|
||||
"description": "Run the planning-with-files completion check script.",
|
||||
"description": "Run the planning-with-files completion check for the active plan.",
|
||||
"parameters": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
@@ -65,3 +214,6 @@ def register(ctx: Any) -> None:
|
||||
)
|
||||
ctx.register_hook("pre_llm_call", pre_llm_call)
|
||||
ctx.register_hook("post_tool_call", post_tool_call)
|
||||
ctx.register_hook("pre_verify", pre_verify)
|
||||
_register_commands(ctx)
|
||||
_register_skill(ctx)
|
||||
|
||||
@@ -21,6 +21,11 @@ _WALL_CLOCK_UTC = re.compile(rb"T[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]+)?Z")
|
||||
_WALL_CLOCK_OFFSET = re.compile(
|
||||
rb"T[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]+)?([+-][0-9]{2}:[0-9]{2})"
|
||||
)
|
||||
_DARWIN_SYSTEM_ALIASES = {
|
||||
Path("/var"): Path("/private/var"),
|
||||
Path("/tmp"): Path("/private/tmp"),
|
||||
Path("/etc"): Path("/private/etc"),
|
||||
}
|
||||
|
||||
for _stream in (sys.stdout, sys.stderr):
|
||||
_reconfigure = getattr(_stream, "reconfigure", None)
|
||||
@@ -38,13 +43,37 @@ def _is_reparse_or_link_stat(info: os.stat_result) -> bool:
|
||||
return bool(attrs & getattr(stat, "FILE_ATTRIBUTE_REPARSE_POINT", 0x400))
|
||||
|
||||
|
||||
def _is_trusted_darwin_system_alias(path: Path, info: os.stat_result) -> bool:
|
||||
"""Admit only macOS's fixed root aliases after verifying their targets."""
|
||||
if sys.platform != "darwin" or not stat.S_ISLNK(info.st_mode):
|
||||
return False
|
||||
absolute = Path(os.path.abspath(path))
|
||||
expected = _DARWIN_SYSTEM_ALIASES.get(absolute)
|
||||
if expected is None:
|
||||
return False
|
||||
try:
|
||||
link_target = Path(os.readlink(absolute))
|
||||
if not link_target.is_absolute():
|
||||
link_target = absolute.parent / link_target
|
||||
if Path(os.path.normpath(link_target)) != expected:
|
||||
return False
|
||||
if Path(os.path.realpath(absolute)) != expected:
|
||||
return False
|
||||
target_info = expected.lstat()
|
||||
except (OSError, RuntimeError):
|
||||
return False
|
||||
return stat.S_ISDIR(target_info.st_mode) and not _is_reparse_or_link_stat(target_info)
|
||||
|
||||
|
||||
def _assert_no_reparse_components(path: Path) -> Path:
|
||||
absolute = Path(os.path.abspath(path))
|
||||
current = Path(absolute.anchor)
|
||||
for part in absolute.parts[1:]:
|
||||
current /= part
|
||||
info = current.lstat()
|
||||
if _is_reparse_or_link_stat(info):
|
||||
if _is_reparse_or_link_stat(info) and not _is_trusted_darwin_system_alias(
|
||||
current, info
|
||||
):
|
||||
raise ValueError("refusing symlink or reparse-point context path")
|
||||
return absolute
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
import stat
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
@@ -7,12 +8,32 @@ from typing import Any
|
||||
from .constants import PROGRESS_TAIL_LINES, READ_PREVIEW_LINES
|
||||
from .context_frame import frame_bytes, read_regular_bytes, select_lines, verified_frame
|
||||
from .hook_state import add_reminder, pop_reminders, state_key
|
||||
from .paths import normalize_cwd
|
||||
from .planning_files import normalize_wall_clock
|
||||
from .paths import (
|
||||
ambiguity_notice,
|
||||
attestation_path_for,
|
||||
effective_project_root,
|
||||
normalize_cwd,
|
||||
plan_id_for,
|
||||
plan_root_is_pinned,
|
||||
resolve_plan,
|
||||
resolve_plan_dir,
|
||||
)
|
||||
from .planning_files import evaluate_gate, normalize_wall_clock
|
||||
|
||||
ATTACH_LEGACY = "legacy" # no .planning/sessions directory: single-session setup
|
||||
ATTACH_ATTACHED = "attached" # sessions directory armed and this session holds a sentinel
|
||||
ATTACH_DETACHED = "detached" # sessions directory armed, no sentinel (or unsafe directory)
|
||||
|
||||
|
||||
def _runtime_project_dir(kwargs: dict[str, Any]) -> Path | None:
|
||||
"""Resolve the active Hermes project, never a cached import-time cwd."""
|
||||
"""Resolve the active Hermes project, never a cached import-time cwd.
|
||||
|
||||
Honors the per-invocation opt-out (PLANNING_DISABLED=1, issue #195) and
|
||||
the absolute plan-root pin (PWF_PLAN_ROOT, issue #212); a broken pin
|
||||
fails closed so no unrelated plan is injected.
|
||||
"""
|
||||
if os.environ.get("PLANNING_DISABLED", "") == "1":
|
||||
return None
|
||||
try:
|
||||
from agent.runtime_cwd import resolve_agent_cwd
|
||||
except ImportError:
|
||||
@@ -28,20 +49,20 @@ def _runtime_project_dir(kwargs: dict[str, Any]) -> Path | None:
|
||||
project = normalize_cwd(str(candidate))
|
||||
if not project.is_dir():
|
||||
return None
|
||||
return project
|
||||
except (OSError, RuntimeError, ValueError):
|
||||
return None
|
||||
return effective_project_root(project)
|
||||
|
||||
|
||||
def _session_is_attached(project_dir: Path, session_id: str) -> bool:
|
||||
"""Apply opt-in isolation once a project creates its sessions directory."""
|
||||
def _session_attachment(project_dir: Path, session_id: str) -> str:
|
||||
"""Opt-in isolation state once a project creates its sessions directory."""
|
||||
sessions_dir = project_dir / ".planning" / "sessions"
|
||||
try:
|
||||
info = sessions_dir.lstat()
|
||||
except FileNotFoundError:
|
||||
return True
|
||||
return ATTACH_LEGACY
|
||||
except OSError:
|
||||
return False
|
||||
return ATTACH_DETACHED
|
||||
attrs = getattr(info, "st_file_attributes", 0)
|
||||
if (
|
||||
not stat.S_ISDIR(info.st_mode)
|
||||
@@ -49,21 +70,25 @@ def _session_is_attached(project_dir: Path, session_id: str) -> bool:
|
||||
or attrs & getattr(stat, "FILE_ATTRIBUTE_REPARSE_POINT", 0x400)
|
||||
or not session_id
|
||||
):
|
||||
return False
|
||||
return ATTACH_DETACHED
|
||||
try:
|
||||
sentinel = sessions_dir / f"{state_key(project_dir, session_id)}.attached"
|
||||
read_regular_bytes(sentinel, max_source_bytes=32)
|
||||
return True
|
||||
return ATTACH_ATTACHED
|
||||
except (FileNotFoundError, OSError, RuntimeError, ValueError):
|
||||
return False
|
||||
return ATTACH_DETACHED
|
||||
|
||||
|
||||
def _has_regular_plan(project_dir: Path) -> bool:
|
||||
def _resolve_plan(project_dir: Path, *, explicit: bool = False) -> tuple[Path | None, list[str]]:
|
||||
"""Active plan directory whose task_plan.md is a regular file, plus nested conflicts."""
|
||||
plan_dir, conflicts = resolve_plan(project_dir, explicit=explicit)
|
||||
if plan_dir is None:
|
||||
return None, conflicts
|
||||
try:
|
||||
read_regular_bytes(project_dir / "task_plan.md", max_source_bytes=4 * 1024 * 1024)
|
||||
return True
|
||||
read_regular_bytes(plan_dir / "task_plan.md", max_source_bytes=4 * 1024 * 1024)
|
||||
except (FileNotFoundError, OSError, RuntimeError, ValueError):
|
||||
return False
|
||||
return None, []
|
||||
return plan_dir, []
|
||||
|
||||
|
||||
def _session_id(kwargs: dict[str, Any]) -> str:
|
||||
@@ -71,16 +96,45 @@ def _session_id(kwargs: dict[str, Any]) -> str:
|
||||
return str(kwargs.get("session_id") or kwargs.get("task_id") or "")
|
||||
|
||||
|
||||
def build_user_prompt_context(project_dir: Path) -> str:
|
||||
task_plan = project_dir / "task_plan.md"
|
||||
def _locate(kwargs: dict[str, Any]) -> tuple[Path | None, Path | None, list[str], str]:
|
||||
"""Shared front half of every hook: project, plan, nested conflicts, session id.
|
||||
|
||||
A PWF_PLAN_ROOT pin or an attached session is an explicit selection and
|
||||
skips the nested-root check, exactly as inject-plan.sh treats them.
|
||||
"""
|
||||
project_dir = _runtime_project_dir(kwargs)
|
||||
if project_dir is None:
|
||||
return None, None, [], ""
|
||||
session_id = _session_id(kwargs)
|
||||
attachment = _session_attachment(project_dir, session_id)
|
||||
if attachment == ATTACH_DETACHED:
|
||||
return project_dir, None, [], session_id
|
||||
explicit = plan_root_is_pinned() or attachment == ATTACH_ATTACHED
|
||||
plan_dir, conflicts = _resolve_plan(project_dir, explicit=explicit)
|
||||
return project_dir, plan_dir, conflicts, session_id
|
||||
|
||||
|
||||
def build_user_prompt_context(project_dir: Path, plan_dir: Path | None = None) -> str:
|
||||
"""Frame the active plan for injection.
|
||||
|
||||
Legacy root plans produce the exact bytes previous releases produced.
|
||||
Slug plans (``.planning/<id>/``) add one line naming the resolved plan so
|
||||
slug-over-root shadowing stays visible, read their attestation from
|
||||
``<id>/.attestation`` and their mode marker from ``<id>/.mode``.
|
||||
"""
|
||||
if plan_dir is None:
|
||||
plan_dir = resolve_plan_dir(project_dir) or project_dir
|
||||
task_plan = plan_dir / "task_plan.md"
|
||||
parts = ["[planning-with-files] ACTIVE PLAN — current state:"]
|
||||
if plan_dir != project_dir:
|
||||
parts.append(f"[planning-with-files] plan: {plan_id_for(project_dir, plan_dir)}")
|
||||
try:
|
||||
parts.append(
|
||||
verified_frame(
|
||||
"plan",
|
||||
task_plan,
|
||||
attestation=project_dir / ".plan-attestation",
|
||||
mode=project_dir / ".mode",
|
||||
attestation=attestation_path_for(project_dir, plan_dir),
|
||||
mode=plan_dir / ".mode",
|
||||
head=READ_PREVIEW_LINES,
|
||||
)
|
||||
)
|
||||
@@ -88,7 +142,7 @@ def build_user_prompt_context(project_dir: Path) -> str:
|
||||
return f"[planning-with-files] context blocked: {exc}"
|
||||
try:
|
||||
progress_bytes = select_lines(
|
||||
read_regular_bytes(project_dir / "progress.md"), tail=PROGRESS_TAIL_LINES
|
||||
read_regular_bytes(plan_dir / "progress.md"), tail=PROGRESS_TAIL_LINES
|
||||
)
|
||||
normalized = normalize_wall_clock(
|
||||
progress_bytes.decode("utf-8", errors="replace")
|
||||
@@ -97,7 +151,7 @@ def build_user_prompt_context(project_dir: Path) -> str:
|
||||
except (FileNotFoundError, OSError, UnicodeError, ValueError):
|
||||
pass
|
||||
try:
|
||||
read_regular_bytes(project_dir / "findings.md", max_source_bytes=4 * 1024 * 1024)
|
||||
read_regular_bytes(plan_dir / "findings.md", max_source_bytes=4 * 1024 * 1024)
|
||||
parts.append("[planning-with-files] Read findings.md for research context. Continue from the current phase.")
|
||||
except (FileNotFoundError, OSError, ValueError):
|
||||
pass
|
||||
@@ -105,15 +159,18 @@ def build_user_prompt_context(project_dir: Path) -> str:
|
||||
|
||||
|
||||
def pre_llm_call(**kwargs: Any) -> dict[str, str] | None:
|
||||
project_dir = _runtime_project_dir(kwargs)
|
||||
if project_dir is None or not _has_regular_plan(project_dir):
|
||||
project_dir, plan_dir, conflicts, session_id = _locate(kwargs)
|
||||
if project_dir is None:
|
||||
return None
|
||||
if plan_dir is None:
|
||||
# The refusal holds in every hook; the notice is turn-scoped, so only
|
||||
# this once-per-turn hook says why (same split as inject-plan.sh).
|
||||
if conflicts:
|
||||
return {"context": ambiguity_notice(conflicts)}
|
||||
return None
|
||||
user_message = str(kwargs.get("user_message", ""))
|
||||
session_id = _session_id(kwargs)
|
||||
if not _session_is_attached(project_dir, session_id):
|
||||
return None
|
||||
reminder_messages = pop_reminders(project_dir, session_id)
|
||||
context = build_user_prompt_context(project_dir)
|
||||
context = build_user_prompt_context(project_dir, plan_dir)
|
||||
parts: list[str] = []
|
||||
if reminder_messages:
|
||||
parts.append("\n".join(reminder_messages))
|
||||
@@ -139,12 +196,30 @@ def post_tool_call(**kwargs: Any) -> None:
|
||||
return None
|
||||
else:
|
||||
return None
|
||||
project_dir = _runtime_project_dir(kwargs)
|
||||
if project_dir is None or not _has_regular_plan(project_dir):
|
||||
return None
|
||||
session_id = _session_id(kwargs)
|
||||
if not _session_is_attached(project_dir, session_id):
|
||||
project_dir, plan_dir, _conflicts, session_id = _locate(kwargs)
|
||||
if project_dir is None or plan_dir is None:
|
||||
return None
|
||||
message = "[planning-with-files] Update progress.md with what you just did. If a phase is now complete, update task_plan.md status."
|
||||
add_reminder(project_dir, session_id, message)
|
||||
return None
|
||||
|
||||
|
||||
def pre_verify(**kwargs: Any) -> dict[str, str] | None:
|
||||
"""Completion gate on Hermes' verification-loop hook (gated mode only).
|
||||
|
||||
Hermes fires ``pre_verify`` once per turn when the agent edited files and
|
||||
is about to finish, and bounds continuations by ``agent.max_verify_nudges``
|
||||
(default 3). The gate decision table lives in ``evaluate_gate``; every
|
||||
plan without the ``gate`` token stays advisory and this hook returns None,
|
||||
so legacy and autonomous plans never hold a turn open.
|
||||
"""
|
||||
project_dir, plan_dir, _conflicts, _session_id = _locate(kwargs)
|
||||
if project_dir is None or plan_dir is None:
|
||||
return None
|
||||
try:
|
||||
reason = evaluate_gate(project_dir, plan_dir)
|
||||
except (OSError, RuntimeError, ValueError):
|
||||
return None
|
||||
if not reason:
|
||||
return None
|
||||
return {"action": "continue", "message": reason}
|
||||
|
||||
@@ -1,10 +1,18 @@
|
||||
import os
|
||||
import re
|
||||
import stat
|
||||
from pathlib import Path
|
||||
|
||||
from .constants import PLUGIN_DIR
|
||||
|
||||
SKILL_DIR_NAME = "planning-with-files"
|
||||
|
||||
# Same shape the sh resolver enforces (slug_is_valid in resolve-plan-dir.sh):
|
||||
# first character alphanumeric or underscore, then letters, digits, dot, dash,
|
||||
# underscore. Rejects traversal, separators, and whitespace by construction.
|
||||
_SLUG_RE = re.compile(r"^[A-Za-z0-9_][A-Za-z0-9._-]*$")
|
||||
_REPARSE_ATTR = getattr(stat, "FILE_ATTRIBUTE_REPARSE_POINT", 0x400)
|
||||
|
||||
|
||||
def has_skill_assets(candidate: Path) -> bool:
|
||||
return (candidate / "templates").is_dir() and (candidate / "scripts" / "check-complete.sh").is_file()
|
||||
@@ -36,6 +44,27 @@ def resolve_explicit_skill_dir() -> Path | None:
|
||||
return None
|
||||
|
||||
|
||||
def plugin_skill_dir() -> Path | None:
|
||||
"""Skill assets that ship next to the plugin itself, never a cwd guess.
|
||||
|
||||
Walks up from the plugin directory only: the repository checkout
|
||||
(``.hermes/skills/planning-with-files`` beside ``.hermes/plugins``) or a
|
||||
user profile (``<HERMES_HOME>/skills/planning-with-files`` beside
|
||||
``<HERMES_HOME>/plugins``). Used for anything registered under the
|
||||
plugin's trusted namespace, so an untrusted working directory can never
|
||||
supply it.
|
||||
"""
|
||||
explicit = resolve_explicit_skill_dir()
|
||||
if explicit is not None:
|
||||
return explicit
|
||||
start = PLUGIN_DIR.resolve()
|
||||
for candidate in [start, *start.parents]:
|
||||
resolved = resolve_skill_dir_from(candidate)
|
||||
if resolved is not None:
|
||||
return resolved
|
||||
return None
|
||||
|
||||
|
||||
def find_skill_dir(start: Path) -> Path:
|
||||
explicit = resolve_explicit_skill_dir()
|
||||
if explicit is not None:
|
||||
@@ -79,3 +108,228 @@ def resolve_skill_dir(project_dir: Path) -> Path:
|
||||
SKILL_ROOT = find_skill_dir(PLUGIN_DIR)
|
||||
TEMPLATES_DIR = SKILL_ROOT / "templates"
|
||||
SCRIPTS_DIR = SKILL_ROOT / "scripts"
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Active plan resolution (slug mode parity with resolve-plan-dir.sh and the
|
||||
# nested-root conflict rule of inject-plan.sh)
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
def _is_link_or_reparse(path: Path) -> bool:
|
||||
try:
|
||||
info = path.lstat()
|
||||
except OSError:
|
||||
return True
|
||||
if stat.S_ISLNK(info.st_mode):
|
||||
return True
|
||||
return bool(getattr(info, "st_file_attributes", 0) & _REPARSE_ATTR)
|
||||
|
||||
|
||||
def _is_regular_file(path: Path) -> bool:
|
||||
try:
|
||||
info = path.lstat()
|
||||
except OSError:
|
||||
return False
|
||||
if stat.S_ISLNK(info.st_mode) or getattr(info, "st_file_attributes", 0) & _REPARSE_ATTR:
|
||||
return False
|
||||
return stat.S_ISREG(info.st_mode)
|
||||
|
||||
|
||||
def slug_is_valid(slug: str) -> bool:
|
||||
return bool(slug) and _SLUG_RE.match(slug) is not None
|
||||
|
||||
|
||||
def plan_root_is_pinned() -> bool:
|
||||
"""True when PWF_PLAN_ROOT is set; the pin itself is validated by effective_project_root."""
|
||||
return bool(os.environ.get("PWF_PLAN_ROOT", "").strip())
|
||||
|
||||
|
||||
def effective_project_root(project_dir: Path) -> Path | None:
|
||||
"""Apply the PWF_PLAN_ROOT pin (issue #212); a broken pin fails closed.
|
||||
|
||||
With the variable unset the runtime project passes through untouched.
|
||||
A pin must be an absolute path to an existing directory that is not a
|
||||
UNC path and carries no link component; anything else returns None so
|
||||
the hooks inject nothing rather than falling back to an unrelated plan.
|
||||
"""
|
||||
pin = os.environ.get("PWF_PLAN_ROOT", "").strip()
|
||||
if not pin:
|
||||
return project_dir
|
||||
pin_path = Path(pin)
|
||||
if not pin_path.is_absolute() or pin.startswith(("\\\\", "//")):
|
||||
return None
|
||||
try:
|
||||
pin_real = pin_path.resolve(strict=True)
|
||||
except (OSError, RuntimeError):
|
||||
return None
|
||||
if not pin_real.is_dir() or _is_link_or_reparse(pin_path):
|
||||
return None
|
||||
return pin_real
|
||||
|
||||
|
||||
def _slug_plan_dir(planning_root: Path, slug: str) -> Path | None:
|
||||
"""Return .planning/<slug> when it is a contained, real directory with a plan."""
|
||||
if not slug_is_valid(slug):
|
||||
return None
|
||||
candidate = planning_root / slug
|
||||
if _is_link_or_reparse(candidate) or not candidate.is_dir():
|
||||
return None
|
||||
try:
|
||||
candidate.resolve(strict=True).relative_to(planning_root.resolve(strict=True))
|
||||
except (OSError, RuntimeError, ValueError):
|
||||
return None
|
||||
if not _is_regular_file(candidate / "task_plan.md"):
|
||||
return None
|
||||
return candidate
|
||||
|
||||
|
||||
def _read_active_pointer(planning_root: Path) -> str:
|
||||
"""The single slug named by .planning/.active_plan, BOM and whitespace stripped."""
|
||||
pointer = planning_root / ".active_plan"
|
||||
if not _is_regular_file(pointer):
|
||||
return ""
|
||||
try:
|
||||
raw = pointer.read_text(encoding="utf-8-sig", errors="strict")
|
||||
except (OSError, UnicodeError):
|
||||
return ""
|
||||
lines = [line.strip() for line in raw.splitlines() if line.strip()]
|
||||
return lines[0] if len(lines) == 1 else ""
|
||||
|
||||
|
||||
def nested_live_plans(root: Path) -> list[str]:
|
||||
"""Direct children whose own .planning holds a live plan (<slug>/task_plan.md).
|
||||
|
||||
Mirrors the ``*/.planning/*/task_plan.md`` probe in inject-plan.sh: depth
|
||||
one only, dotted children skipped like the shell glob, and only a LIVE
|
||||
nested plan competes. An empty nested ``.planning`` or a loose nested
|
||||
``task_plan.md`` never counts, because a thread working in that child
|
||||
could not inject anything from it either.
|
||||
"""
|
||||
found: list[str] = []
|
||||
try:
|
||||
children = sorted(root.iterdir())
|
||||
except OSError:
|
||||
return found
|
||||
for child in children:
|
||||
if child.name.startswith("."):
|
||||
continue
|
||||
try:
|
||||
if not child.is_dir() or _is_link_or_reparse(child):
|
||||
continue
|
||||
planning = child / ".planning"
|
||||
if not planning.is_dir():
|
||||
continue
|
||||
for slug_dir in planning.iterdir():
|
||||
if slug_dir.name.startswith("."):
|
||||
continue
|
||||
if slug_dir.is_dir() and _is_regular_file(slug_dir / "task_plan.md"):
|
||||
found.append(child.name)
|
||||
break
|
||||
except OSError:
|
||||
continue
|
||||
return found
|
||||
|
||||
|
||||
def resolve_plan(
|
||||
project_dir: Path, *, plan_id: str | None = None, explicit: bool = False
|
||||
) -> tuple[Path | None, list[str]]:
|
||||
"""Resolve the active plan directory; return it with any nested conflicts.
|
||||
|
||||
Precedence mirrors resolve-plan-dir.sh: an explicit plan id (the PLAN_ID
|
||||
environment variable when not passed), then .planning/.active_plan, then
|
||||
the newest .planning/<slug>/task_plan.md by modification time, then the
|
||||
legacy root task_plan.md. Slugs are validated and the chosen directory
|
||||
must stay inside .planning (no symlink or junction escape).
|
||||
|
||||
A cwd guess (pointer, newest, or legacy root) is refused when a direct
|
||||
child of the root carries its own live plan (issue #212): the result is
|
||||
``(None, [child names])`` so the caller can say why. ``explicit`` marks a
|
||||
selection that skips that check, exactly as inject-plan.sh does for a
|
||||
``PWF_PLAN_ROOT`` pin, an attached session, or a ``PLAN_ID`` slug.
|
||||
"""
|
||||
planning_root = project_dir / ".planning"
|
||||
requested = plan_id if plan_id is not None else os.environ.get("PLAN_ID", "").strip()
|
||||
if requested:
|
||||
# A set PLAN_ID is a BINDING, not a hint (issue #237).
|
||||
#
|
||||
# A slug that resolves is authoritative and skips the nested check. One
|
||||
# that does NOT resolve ends resolution right here. Falling through to
|
||||
# the pointer, the newest slug and the legacy root turned a
|
||||
# one-character typo into a silent switch: the operator asked for plan
|
||||
# A, .active_plan or newest-by-mtime answered with plan B, and B was
|
||||
# what got attested and injected at rc=0. Every rejection route ends the
|
||||
# same way, whether the selector failed slug validation (traversal
|
||||
# shapes included), named no directory, or failed containment. The
|
||||
# caller receives "no plan" and takes its own fail-closed path rather
|
||||
# than a plan nobody selected.
|
||||
#
|
||||
# An EMPTY PLAN_ID still means "no selector": resolution continues below
|
||||
# exactly as before, which is what the legacy root path depends on.
|
||||
explicit_dir = _slug_plan_dir(planning_root, requested)
|
||||
if explicit_dir is not None:
|
||||
return explicit_dir, []
|
||||
return None, []
|
||||
|
||||
chosen: Path | None = None
|
||||
if planning_root.is_dir() and not _is_link_or_reparse(planning_root):
|
||||
pointed = _read_active_pointer(planning_root)
|
||||
if pointed:
|
||||
chosen = _slug_plan_dir(planning_root, pointed)
|
||||
if chosen is None:
|
||||
newest_mtime = -1.0
|
||||
try:
|
||||
entries = list(planning_root.iterdir())
|
||||
except OSError:
|
||||
entries = []
|
||||
for entry in entries:
|
||||
candidate = _slug_plan_dir(planning_root, entry.name)
|
||||
if candidate is None:
|
||||
continue
|
||||
try:
|
||||
mtime = (candidate / "task_plan.md").stat().st_mtime
|
||||
except OSError:
|
||||
continue
|
||||
if mtime > newest_mtime:
|
||||
newest_mtime = mtime
|
||||
chosen = candidate
|
||||
if chosen is None and _is_regular_file(project_dir / "task_plan.md"):
|
||||
chosen = project_dir
|
||||
if chosen is None:
|
||||
return None, []
|
||||
if not explicit:
|
||||
conflicts = nested_live_plans(project_dir)
|
||||
if conflicts:
|
||||
return None, conflicts
|
||||
return chosen, []
|
||||
|
||||
|
||||
def resolve_plan_dir(
|
||||
project_dir: Path, *, plan_id: str | None = None, explicit: bool = False
|
||||
) -> Path | None:
|
||||
"""The directory that owns the active task_plan.md, or None (see resolve_plan)."""
|
||||
return resolve_plan(project_dir, plan_id=plan_id, explicit=explicit)[0]
|
||||
|
||||
|
||||
def ambiguity_notice(conflicts: list[str]) -> str:
|
||||
"""The once-per-turn refusal line, same wording as inject-plan.sh."""
|
||||
listed = ", ".join(conflicts[:3])
|
||||
return (
|
||||
"[planning-with-files] Ambiguous plan: this cwd has an active plan and a nested project "
|
||||
f"below it has its own ({listed}). Nothing injected. Pin the thread with "
|
||||
"PWF_PLAN_ROOT=<absolute path> or PLAN_ID=<slug>."
|
||||
)
|
||||
|
||||
|
||||
def plan_id_for(project_dir: Path, plan_dir: Path) -> str:
|
||||
"""Human-readable plan identity: the slug, or 'root' for legacy mode."""
|
||||
if plan_dir == project_dir:
|
||||
return "root"
|
||||
return plan_dir.name
|
||||
|
||||
|
||||
def attestation_path_for(project_dir: Path, plan_dir: Path) -> Path:
|
||||
"""Legacy root plans attest to ./.plan-attestation; slug plans to <dir>/.attestation."""
|
||||
if plan_dir == project_dir:
|
||||
return project_dir / ".plan-attestation"
|
||||
return plan_dir / ".attestation"
|
||||
|
||||
@@ -1,10 +1,19 @@
|
||||
import datetime as _dt
|
||||
import hashlib
|
||||
import os
|
||||
import re
|
||||
import secrets
|
||||
import shutil
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
from .constants import PLANNING_FILES, PLAN_PREVIEW_LINES, PROGRESS_TAIL_LINES
|
||||
from .paths import resolve_skill_dir
|
||||
from .paths import (
|
||||
attestation_path_for,
|
||||
plan_id_for,
|
||||
resolve_plan_dir,
|
||||
resolve_skill_dir,
|
||||
)
|
||||
|
||||
|
||||
# Wall-clock times inside the injected progress tail move on every fire, which
|
||||
@@ -15,6 +24,8 @@ from .paths import resolve_skill_dir
|
||||
_WALL_CLOCK_UTC = re.compile(r"T[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]+)?Z")
|
||||
_WALL_CLOCK_OFFSET = re.compile(r"T[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]+)?([+-][0-9]{2}:[0-9]{2})")
|
||||
|
||||
_CONTROL_CHARS = re.compile(r"[\x01-\x1f]")
|
||||
|
||||
|
||||
def normalize_wall_clock(text: str) -> str:
|
||||
"""Flatten ISO-8601 clock times to T00:00:00, keeping any UTC offset."""
|
||||
@@ -36,25 +47,37 @@ def head_lines(path: Path, limit: int) -> str:
|
||||
return "\n".join(lines[:limit])
|
||||
|
||||
|
||||
def ensure_planning_files(project_dir: Path, template: str = "default") -> dict[str, Any]:
|
||||
skill_root = resolve_skill_dir(project_dir)
|
||||
templates_dir = skill_root / "templates"
|
||||
def slugify(name: str) -> str:
|
||||
"""Same transform as init-session.sh: lowercase, non-alphanumerics to dashes, 40 chars."""
|
||||
lowered = name.lower()
|
||||
dashed = re.sub(r"[^a-z0-9]", "-", lowered)
|
||||
dashed = re.sub(r"-{2,}", "-", dashed).strip("-")
|
||||
return dashed[:40]
|
||||
|
||||
|
||||
def _copy_templates(plan_dir: Path, templates_dir: Path, template: str) -> list[str]:
|
||||
created: list[str] = []
|
||||
for name in PLANNING_FILES:
|
||||
dest = project_dir / name
|
||||
dest = plan_dir / name
|
||||
if dest.exists():
|
||||
continue
|
||||
template_name = f"{name}"
|
||||
if template != "default":
|
||||
prefixed = templates_dir / f"{template}_{name}"
|
||||
source = prefixed if prefixed.exists() else templates_dir / template_name
|
||||
source = prefixed if prefixed.exists() else templates_dir / name
|
||||
else:
|
||||
source = templates_dir / template_name
|
||||
source = templates_dir / name
|
||||
if source.exists():
|
||||
shutil.copy2(source, dest)
|
||||
else:
|
||||
dest.write_text("", encoding="utf-8")
|
||||
created.append(name)
|
||||
return created
|
||||
|
||||
|
||||
def ensure_planning_files(project_dir: Path, template: str = "default") -> dict[str, Any]:
|
||||
"""Legacy root-mode initialization: the three files in the project root."""
|
||||
skill_root = resolve_skill_dir(project_dir)
|
||||
created = _copy_templates(project_dir, skill_root / "templates", template)
|
||||
return {
|
||||
"project_dir": str(project_dir),
|
||||
"created": created,
|
||||
@@ -63,6 +86,87 @@ def ensure_planning_files(project_dir: Path, template: str = "default") -> dict[
|
||||
}
|
||||
|
||||
|
||||
def write_attestation(project_dir: Path, plan_dir: Path) -> str:
|
||||
"""Lock task_plan.md the way attest-plan.sh does: a lowercase SHA-256 hex line."""
|
||||
plan_file = plan_dir / "task_plan.md"
|
||||
digest = hashlib.sha256(plan_file.read_bytes()).hexdigest()
|
||||
target = attestation_path_for(project_dir, plan_dir)
|
||||
tmp = target.with_name(target.name + ".tmp")
|
||||
tmp.write_text(digest + "\n", encoding="ascii")
|
||||
os.replace(tmp, target)
|
||||
return digest
|
||||
|
||||
|
||||
def apply_v3_mode(project_dir: Path, plan_dir: Path, mode: str) -> dict[str, Any]:
|
||||
"""Write the v3 markers init-session.sh writes: counter reset, nonce, .mode, attestation."""
|
||||
if mode not in {"autonomous", "gated"}:
|
||||
raise ValueError(f"unknown mode: {mode!r} (expected autonomous or gated)")
|
||||
(plan_dir / ".stop_blocks").write_text("0\n", encoding="ascii")
|
||||
try:
|
||||
(plan_dir / ".gate_last_ledger").unlink()
|
||||
except FileNotFoundError:
|
||||
pass
|
||||
(plan_dir / ".nonce").write_text(secrets.token_hex(8) + "\n", encoding="ascii")
|
||||
marker = "autonomous gate\n" if mode == "gated" else "autonomous\n"
|
||||
(plan_dir / ".mode").write_text(marker, encoding="ascii")
|
||||
digest = write_attestation(project_dir, plan_dir)
|
||||
return {"marker": marker.strip(), "attestation": digest}
|
||||
|
||||
|
||||
def init_plan(
|
||||
project_dir: Path,
|
||||
*,
|
||||
name: str = "",
|
||||
template: str = "default",
|
||||
mode: str = "",
|
||||
) -> dict[str, Any]:
|
||||
"""Create planning files in root mode or, with a name, in an isolated slug directory.
|
||||
|
||||
Mirrors init-session.sh: a name creates ``.planning/YYYY-MM-DD-<slug>/``
|
||||
and records it in ``.planning/.active_plan``; ``mode`` (``autonomous`` or
|
||||
``gated``) writes the v3 markers and attests the fresh plan. Existing
|
||||
files are never overwritten.
|
||||
"""
|
||||
skill_root = resolve_skill_dir(project_dir)
|
||||
templates_dir = skill_root / "templates"
|
||||
if template not in {"default", "analytics"}:
|
||||
template = "default"
|
||||
normalized_mode = (mode or "").strip().lower()
|
||||
if normalized_mode in {"", "legacy", "none"}:
|
||||
normalized_mode = ""
|
||||
elif normalized_mode == "gate":
|
||||
normalized_mode = "gated"
|
||||
if normalized_mode not in {"", "autonomous", "gated"}:
|
||||
return {"ok": False, "error": f"unknown mode: {mode}", "project_dir": str(project_dir)}
|
||||
|
||||
slug = slugify(name) if name else ""
|
||||
if slug:
|
||||
planning_root = project_dir / ".planning"
|
||||
planning_root.mkdir(parents=True, exist_ok=True)
|
||||
plan_id = f"{_dt.date.today().isoformat()}-{slug}"
|
||||
plan_dir = planning_root / plan_id
|
||||
plan_dir.mkdir(exist_ok=True)
|
||||
(planning_root / ".active_plan").write_text(plan_id + "\n", encoding="utf-8")
|
||||
else:
|
||||
plan_dir = project_dir
|
||||
plan_id = "root"
|
||||
|
||||
created = _copy_templates(plan_dir, templates_dir, template)
|
||||
result: dict[str, Any] = {
|
||||
"ok": True,
|
||||
"project_dir": str(project_dir),
|
||||
"plan_dir": str(plan_dir),
|
||||
"plan_id": plan_id,
|
||||
"created": created,
|
||||
"existing": [n for n in PLANNING_FILES if (plan_dir / n).exists()],
|
||||
"skill_root": str(skill_root),
|
||||
"mode": normalized_mode or "legacy",
|
||||
}
|
||||
if normalized_mode:
|
||||
result.update(apply_v3_mode(project_dir, plan_dir, normalized_mode))
|
||||
return result
|
||||
|
||||
|
||||
def phase_counts(task_plan: str) -> dict[str, int]:
|
||||
counts = {"complete": 0, "in_progress": 0, "pending": 0, "failed": 0, "total": 0}
|
||||
for line in task_plan.splitlines():
|
||||
@@ -157,25 +261,193 @@ def extract_current_phase(task_plan: str) -> str:
|
||||
return "No phase found"
|
||||
|
||||
|
||||
def first_in_progress_phase(task_plan: str) -> str:
|
||||
"""Heading of the first phase whose status is in_progress, '### ' stripped."""
|
||||
heading = ""
|
||||
for line in task_plan.splitlines():
|
||||
if line.startswith("### "):
|
||||
heading = line[4:]
|
||||
continue
|
||||
if "**Status:** in_progress" in line or "[in_progress]" in line:
|
||||
return heading
|
||||
return ""
|
||||
|
||||
|
||||
def gate_counts(task_plan: str) -> dict[str, int]:
|
||||
"""Phase counts the way check-complete.sh --gate counts them.
|
||||
|
||||
``total`` is the number of lines containing ``### Phase``. Each status is
|
||||
the per-field maximum of the primary ``**Status:** <state>`` form and the
|
||||
inline ``[<state>]`` marker form, so a plan that mixes both formats can
|
||||
never let an in_progress phase slip past the gate.
|
||||
"""
|
||||
lines = task_plan.splitlines()
|
||||
total = sum(1 for line in lines if "### Phase" in line)
|
||||
counts: dict[str, int] = {"total": total}
|
||||
for state in ("complete", "in_progress", "pending"):
|
||||
primary = sum(1 for line in lines if f"**Status:** {state}" in line)
|
||||
inline = sum(1 for line in lines if f"[{state}]" in line)
|
||||
counts[state] = max(primary, inline)
|
||||
return counts
|
||||
|
||||
|
||||
# The strictness-LOWERING mode tokens. Everything else raises strictness, and
|
||||
# the root .mode floor (issue #238) treats the two halves in opposite
|
||||
# directions, so a new token must be classified here deliberately.
|
||||
_LOWERING_MODE_TOKENS = frozenset({"plan-guard-off"})
|
||||
|
||||
|
||||
def _read_mode_file(directory: Path) -> list[str]:
|
||||
"""Tokens of one directory's .mode; empty when absent or unreadable."""
|
||||
try:
|
||||
raw = (directory / ".mode").read_text(encoding="ascii", errors="strict")
|
||||
except (OSError, UnicodeError):
|
||||
return []
|
||||
return raw.split()
|
||||
|
||||
|
||||
def mode_tokens(project_dir: Path, plan_dir: Path) -> list[str]:
|
||||
"""Effective mode: the slug's .mode raised by the project root .mode FLOOR.
|
||||
|
||||
A project makes attestation mandatory by committing a root .mode, which is
|
||||
a reviewed project setting. Reading only <plan-dir>/.mode let a slug plan
|
||||
silently exempt itself (issue #238): init_plan writes no .mode unless the
|
||||
operator asked for a mode, so creating a plan turned the project policy off
|
||||
in one agent-invocable call.
|
||||
|
||||
Strictness-RAISING tokens (autonomous, gate, inject-smart) count when
|
||||
EITHER file carries them: a slug may go stricter than the project asked, it
|
||||
can never go looser. The strictness-LOWERING token (plan-guard-off) survives
|
||||
only when the slug carries it AND, where a root .mode exists, that file
|
||||
carries it too, so a slug cannot switch off a protection the project kept
|
||||
on.
|
||||
|
||||
With no root .mode the result is exactly the slug's tokens, in the slug's
|
||||
own order, which is the invariant existing projects depend on. Root scope
|
||||
has no second source at all: <root>/.mode already IS the plan's .mode
|
||||
there.
|
||||
"""
|
||||
slug = _read_mode_file(plan_dir)
|
||||
if plan_dir == project_dir:
|
||||
return slug
|
||||
# Presence of the file is what makes the root a policy statement, not the
|
||||
# tokens in it. A committed but empty root .mode still says "this project
|
||||
# reviewed its mode and asked for no relaxations", so a slug's
|
||||
# plan-guard-off does not survive it. Testing `not floor` instead would
|
||||
# treat an empty file like a missing one and diverge from inject-plan.sh,
|
||||
# which checks `[ -f "$ROOT_MODE_FILE" ]`.
|
||||
if not (project_dir / ".mode").is_file():
|
||||
return slug
|
||||
floor = _read_mode_file(project_dir)
|
||||
effective = [t for t in slug if t not in _LOWERING_MODE_TOKENS or t in floor]
|
||||
effective.extend(t for t in floor if t not in _LOWERING_MODE_TOKENS and t not in effective)
|
||||
return effective
|
||||
|
||||
|
||||
def _read_counter(path: Path) -> int:
|
||||
try:
|
||||
raw = path.read_text(encoding="ascii", errors="strict").strip()
|
||||
except (OSError, UnicodeError):
|
||||
return 0
|
||||
return int(raw) if (raw.isascii() and raw.isdigit()) else 0
|
||||
|
||||
|
||||
def ledger_line_count(plan_dir: Path) -> int:
|
||||
"""Total lines across <plan-dir>/ledger-*.jsonl, 0 when none exist."""
|
||||
total = 0
|
||||
try:
|
||||
ledgers = sorted(plan_dir.glob("ledger-*.jsonl"))
|
||||
except OSError:
|
||||
return 0
|
||||
for ledger in ledgers:
|
||||
try:
|
||||
with ledger.open("rb") as handle:
|
||||
total += sum(1 for _ in handle)
|
||||
except OSError:
|
||||
continue
|
||||
return total
|
||||
|
||||
|
||||
def evaluate_gate(project_dir: Path, plan_dir: Path) -> str | None:
|
||||
"""The v3 completion gate decision table, in Python, for the Hermes pre_verify hook.
|
||||
|
||||
Returns the continuation message when the stop must be held, otherwise
|
||||
None. Byte-for-byte the same guards as check-complete.sh --gate:
|
||||
|
||||
1. The effective mode contains the ``gate`` token (explicit opt-in):
|
||||
<plan-dir>/.mode, or the project root .mode floor the slug cannot
|
||||
opt out of (issue #238), which is why the project root is a parameter.
|
||||
2. An in_progress phase exists; complete < total alone never blocks.
|
||||
3. (Hermes has no stop_hook_active field; the host bounds re-entry itself
|
||||
through agent.max_verify_nudges.)
|
||||
4. The block counter <plan-dir>/.stop_blocks is below the cap
|
||||
(PWF_GATE_CAP, default 20).
|
||||
5. The ledger advanced since the previous block; a stall allows the stop.
|
||||
|
||||
A block increments the counter and records the ledger size, exactly as
|
||||
the shell gate does, so both routes share one state.
|
||||
"""
|
||||
if os.environ.get("PLANNING_DISABLED", "") == "1":
|
||||
return None
|
||||
if "gate" not in mode_tokens(project_dir, plan_dir):
|
||||
return None
|
||||
try:
|
||||
task_plan = (plan_dir / "task_plan.md").read_text(encoding="utf-8", errors="replace")
|
||||
except OSError:
|
||||
return None
|
||||
counts = gate_counts(task_plan)
|
||||
if counts["total"] <= 0 or counts["in_progress"] <= 0:
|
||||
return None
|
||||
cap_raw = os.environ.get("PWF_GATE_CAP", "").strip()
|
||||
cap = int(cap_raw) if (cap_raw.isascii() and cap_raw.isdigit()) else 20
|
||||
blocks = _read_counter(plan_dir / ".stop_blocks")
|
||||
ledger_prev = _read_counter(plan_dir / ".gate_last_ledger")
|
||||
ledger_now = ledger_line_count(plan_dir)
|
||||
if blocks >= cap:
|
||||
return None
|
||||
if blocks > 0 and ledger_now == ledger_prev:
|
||||
return None
|
||||
phase_name = first_in_progress_phase(task_plan) or "unknown phase"
|
||||
phase_name = _CONTROL_CHARS.sub(" ", phase_name)
|
||||
new_blocks = blocks + 1
|
||||
try:
|
||||
(plan_dir / ".stop_blocks").write_text(f"{new_blocks}\n", encoding="ascii")
|
||||
(plan_dir / ".gate_last_ledger").write_text(f"{ledger_now}\n", encoding="ascii")
|
||||
except OSError:
|
||||
pass
|
||||
return (
|
||||
"[planning-with-files] Gated plan incomplete: phase '"
|
||||
f"{phase_name}' is in_progress ({counts['complete']}/{counts['total']} complete, "
|
||||
f"gate block {new_blocks}/{cap}). Finish or update the plan, then stop."
|
||||
)
|
||||
|
||||
|
||||
def summarize_status(project_dir: Path) -> dict[str, Any]:
|
||||
task_plan_path = project_dir / "task_plan.md"
|
||||
findings_path = project_dir / "findings.md"
|
||||
progress_path = project_dir / "progress.md"
|
||||
if not task_plan_path.exists():
|
||||
plan_dir = resolve_plan_dir(project_dir)
|
||||
if plan_dir is None:
|
||||
return {
|
||||
"exists": False,
|
||||
"message": "No planning files found. Run planning_with_files_init first.",
|
||||
"project_dir": str(project_dir),
|
||||
"files": {
|
||||
"task_plan.md": task_plan_path.exists(),
|
||||
"findings.md": findings_path.exists(),
|
||||
"progress.md": progress_path.exists(),
|
||||
"task_plan.md": False,
|
||||
"findings.md": (project_dir / "findings.md").exists(),
|
||||
"progress.md": (project_dir / "progress.md").exists(),
|
||||
},
|
||||
}
|
||||
task_plan_path = plan_dir / "task_plan.md"
|
||||
findings_path = plan_dir / "findings.md"
|
||||
progress_path = plan_dir / "progress.md"
|
||||
task_plan = task_plan_path.read_text(encoding="utf-8")
|
||||
counts = phase_counts(task_plan)
|
||||
tokens = mode_tokens(project_dir, plan_dir)
|
||||
return {
|
||||
"exists": True,
|
||||
"project_dir": str(project_dir),
|
||||
"plan_dir": str(plan_dir),
|
||||
"plan_id": plan_id_for(project_dir, plan_dir),
|
||||
"mode": " ".join(tokens) if tokens else "legacy",
|
||||
"attested": attestation_path_for(project_dir, plan_dir).is_file(),
|
||||
"current_phase": extract_current_phase(task_plan),
|
||||
"counts": counts,
|
||||
"files": {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
name: planning-with-files
|
||||
version: 0.1.1
|
||||
description: Hermes adapter for persistent project planning and selected context injection. Explicit catchup modes read same-project local session records for aggregate counts or bounded replay. Status controls are advisory. No network upload path.
|
||||
version: 0.2.0
|
||||
description: Hermes adapter for persistent project planning and selected context injection. Resolves root and .planning/<slug> plans, injects the attested plan each turn, reminds after writes, and registers /pwf and /pwf-status. Optional gated mode can request continuation only through the Hermes pre_verify hook, bounded by agent.max_verify_nudges; legacy plans stay advisory. Explicit catchup modes read same-project local session records for aggregate counts or bounded replay. No network upload path.
|
||||
author: planning-with-files contributors
|
||||
provides_tools:
|
||||
- planning_with_files_init
|
||||
@@ -9,3 +9,4 @@ provides_tools:
|
||||
provides_hooks:
|
||||
- pre_llm_call
|
||||
- post_tool_call
|
||||
- pre_verify
|
||||
|
||||
@@ -0,0 +1,135 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Bridge Hermes shell-script hooks to the canonical planning-with-files scripts.
|
||||
|
||||
Hermes runs shell hooks declared under ``hooks:`` in config.yaml, feeding one
|
||||
JSON payload on stdin and reading one JSON object from stdout. The canonical
|
||||
scripts speak Claude Code's hook dialect instead: ``inject-plan.sh`` prints the
|
||||
plan context as plain text and ``gate-stop.sh`` prints a Stop decision. This
|
||||
bridge translates:
|
||||
|
||||
* ``pre_llm_call``: runs ``inject-plan.sh`` in the payload's ``cwd`` and wraps
|
||||
any output as ``{"context": ...}``.
|
||||
* ``pre_verify``: runs ``gate-stop.sh`` with ``stop_hook_active`` false and
|
||||
forwards a ``{"decision": "block", ...}`` line unchanged; Hermes accepts the
|
||||
Claude Code Stop shape on this event.
|
||||
|
||||
Everything else prints ``{}``. Every failure prints ``{}`` and exits 0, so a
|
||||
missing script can never break a Hermes turn. The scripts directory comes from
|
||||
``PLANNING_WITH_FILES_SKILL_ROOT`` when set, otherwise from the usual install
|
||||
locations of the canonical skill.
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import os
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
def _candidate_script_dirs() -> list[Path]:
|
||||
dirs: list[Path] = []
|
||||
explicit = os.environ.get("PLANNING_WITH_FILES_SKILL_ROOT", "").strip()
|
||||
if explicit:
|
||||
dirs.append(Path(explicit).expanduser() / "scripts")
|
||||
home = Path.home()
|
||||
hermes_home = os.environ.get("HERMES_HOME", "").strip()
|
||||
if hermes_home:
|
||||
dirs.append(Path(hermes_home).expanduser() / "skills" / "planning-with-files" / "scripts")
|
||||
dirs.extend(
|
||||
[
|
||||
home / ".claude" / "skills" / "planning-with-files" / "scripts",
|
||||
home / ".agents" / "skills" / "planning-with-files" / "scripts",
|
||||
home / ".hermes" / "skills" / "planning-with-files" / "scripts",
|
||||
Path(__file__).resolve().parent.parent.parent / "skills" / "planning-with-files" / "scripts",
|
||||
]
|
||||
)
|
||||
return dirs
|
||||
|
||||
|
||||
def _find_script(name: str) -> Path | None:
|
||||
for directory in _candidate_script_dirs():
|
||||
candidate = directory / name
|
||||
if candidate.is_file():
|
||||
return candidate
|
||||
return None
|
||||
|
||||
|
||||
def _run(
|
||||
script: Path,
|
||||
cwd: str,
|
||||
*,
|
||||
args: list[str] | None = None,
|
||||
stdin: str = "",
|
||||
session_id: str = "",
|
||||
) -> str:
|
||||
shell = shutil.which("sh")
|
||||
if shell is None:
|
||||
return ""
|
||||
env = dict(os.environ)
|
||||
if session_id and not env.get("PWF_SESSION_ID"):
|
||||
# inject-plan.sh keys session attachment on PWF_SESSION_ID; Hermes
|
||||
# carries the same identity in the payload.
|
||||
env["PWF_SESSION_ID"] = session_id
|
||||
completed = subprocess.run(
|
||||
[shell, str(script), *(args or [])],
|
||||
input=stdin,
|
||||
capture_output=True,
|
||||
text=True,
|
||||
encoding="utf-8",
|
||||
errors="replace",
|
||||
cwd=cwd or None,
|
||||
env=env,
|
||||
timeout=float(os.environ.get("PWF_HERMES_HOOK_TIMEOUT", "25")),
|
||||
check=False,
|
||||
)
|
||||
return completed.stdout
|
||||
|
||||
|
||||
def handle(payload: dict) -> dict:
|
||||
event = str(payload.get("hook_event_name", ""))
|
||||
cwd = str(payload.get("cwd") or os.getcwd())
|
||||
session_id = str(payload.get("session_id") or "")
|
||||
if event == "pre_llm_call":
|
||||
script = _find_script("inject-plan.sh")
|
||||
if script is None:
|
||||
return {}
|
||||
output = _run(script, cwd, args=["--context=userprompt"], session_id=session_id)
|
||||
return {"context": output} if output.strip() else {}
|
||||
if event == "pre_verify":
|
||||
script = _find_script("gate-stop.sh")
|
||||
if script is None:
|
||||
return {}
|
||||
output = _run(script, cwd, stdin=json.dumps({"stop_hook_active": False}), session_id=session_id)
|
||||
for line in output.splitlines():
|
||||
line = line.strip()
|
||||
if line.startswith("{") and '"decision"' in line:
|
||||
try:
|
||||
decision = json.loads(line)
|
||||
except json.JSONDecodeError:
|
||||
continue
|
||||
if decision.get("decision") == "block" and decision.get("reason"):
|
||||
return decision
|
||||
return {}
|
||||
return {}
|
||||
|
||||
|
||||
def main() -> int:
|
||||
try:
|
||||
raw = sys.stdin.read()
|
||||
payload = json.loads(raw) if raw.strip() else {}
|
||||
if not isinstance(payload, dict):
|
||||
payload = {}
|
||||
result = handle(payload)
|
||||
except Exception: # noqa: BLE001 - a hook bridge must never fail the turn
|
||||
result = {}
|
||||
# ASCII-only JSON: Hermes reads stdout as text, and a Windows pipe would
|
||||
# otherwise re-encode the em dash in the plan banner as cp1252.
|
||||
sys.stdout.buffer.write(json.dumps(result, ensure_ascii=True).encode("ascii"))
|
||||
sys.stdout.buffer.flush()
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main())
|
||||
@@ -1,13 +1,20 @@
|
||||
import json
|
||||
import shutil
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
|
||||
from .paths import normalize_cwd, resolve_skill_dir
|
||||
from .planning_files import ensure_planning_files, summarize_status
|
||||
from .paths import normalize_cwd, plan_id_for, resolve_plan_dir, resolve_skill_dir
|
||||
from .planning_files import init_plan, phase_counts, summarize_status
|
||||
|
||||
|
||||
def planning_with_files_init(template: str = "default", cwd: str = "") -> str:
|
||||
def planning_with_files_init(
|
||||
template: str = "default",
|
||||
cwd: str = "",
|
||||
name: str = "",
|
||||
mode: str = "",
|
||||
) -> str:
|
||||
project_dir = normalize_cwd(cwd)
|
||||
result = ensure_planning_files(project_dir, template=template)
|
||||
result = init_plan(project_dir, name=name or "", template=template or "default", mode=mode or "")
|
||||
return json.dumps(result, ensure_ascii=False)
|
||||
|
||||
|
||||
@@ -17,22 +24,62 @@ def planning_with_files_status(cwd: str = "") -> str:
|
||||
return json.dumps(result, ensure_ascii=False)
|
||||
|
||||
|
||||
def _python_completion_report(plan_file: Path) -> dict:
|
||||
"""Fallback for hosts without ``sh`` (native Windows Hermes Desktop)."""
|
||||
counts = phase_counts(plan_file.read_text(encoding="utf-8", errors="replace"))
|
||||
complete = counts["total"] > 0 and counts["complete"] >= counts["total"]
|
||||
if complete:
|
||||
stdout = (
|
||||
f"[planning-with-files] ALL PHASES COMPLETE ({counts['complete']}/{counts['total']}). "
|
||||
"If the user has additional work, add new phases to task_plan.md before starting."
|
||||
)
|
||||
else:
|
||||
stdout = (
|
||||
f"[planning-with-files] Plan incomplete: {counts['complete']}/{counts['total']} phases complete, "
|
||||
f"{counts['in_progress']} in_progress."
|
||||
)
|
||||
return {"ok": True, "returncode": 0, "stdout": stdout, "stderr": "", "complete": complete, "route": "python"}
|
||||
|
||||
|
||||
def planning_with_files_check_complete(cwd: str = "") -> str:
|
||||
project_dir = normalize_cwd(cwd)
|
||||
skill_root = resolve_skill_dir(project_dir)
|
||||
script = skill_root / "scripts" / "check-complete.sh"
|
||||
if not script.exists():
|
||||
plan_dir = resolve_plan_dir(project_dir)
|
||||
if plan_dir is None:
|
||||
return json.dumps(
|
||||
{"ok": False, "error": f"Missing script: {script}", "skill_root": str(skill_root), "complete": False},
|
||||
{
|
||||
"ok": False,
|
||||
"error": "No task_plan.md found. Run planning_with_files_init first.",
|
||||
"skill_root": str(skill_root),
|
||||
"complete": False,
|
||||
},
|
||||
ensure_ascii=False,
|
||||
)
|
||||
completed = subprocess.run(
|
||||
["sh", str(script), str(project_dir / "task_plan.md")],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
check=False,
|
||||
cwd=str(project_dir),
|
||||
)
|
||||
plan_file = plan_dir / "task_plan.md"
|
||||
script = skill_root / "scripts" / "check-complete.sh"
|
||||
shell = shutil.which("sh")
|
||||
if not script.exists() or shell is None:
|
||||
payload = _python_completion_report(plan_file)
|
||||
payload.update({"skill_root": str(skill_root), "plan_dir": str(plan_dir), "plan_id": plan_id_for(project_dir, plan_dir)})
|
||||
if not script.exists():
|
||||
payload["note"] = f"Missing script: {script}; evaluated in Python."
|
||||
return json.dumps(payload, ensure_ascii=False)
|
||||
try:
|
||||
completed = subprocess.run(
|
||||
[shell, str(script), str(plan_file)],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
encoding="utf-8",
|
||||
errors="replace",
|
||||
check=False,
|
||||
cwd=str(project_dir),
|
||||
timeout=30,
|
||||
)
|
||||
except (OSError, subprocess.TimeoutExpired) as exc:
|
||||
payload = _python_completion_report(plan_file)
|
||||
payload.update({"skill_root": str(skill_root), "plan_dir": str(plan_dir), "plan_id": plan_id_for(project_dir, plan_dir)})
|
||||
payload["note"] = f"check-complete.sh did not finish ({exc.__class__.__name__}); evaluated in Python."
|
||||
return json.dumps(payload, ensure_ascii=False)
|
||||
stdout = completed.stdout.strip()
|
||||
return json.dumps(
|
||||
{
|
||||
@@ -41,7 +88,10 @@ def planning_with_files_check_complete(cwd: str = "") -> str:
|
||||
"stdout": stdout,
|
||||
"stderr": completed.stderr.strip(),
|
||||
"skill_root": str(skill_root),
|
||||
"plan_dir": str(plan_dir),
|
||||
"plan_id": plan_id_for(project_dir, plan_dir),
|
||||
"complete": "ALL PHASES COMPLETE" in stdout,
|
||||
"route": "sh",
|
||||
},
|
||||
ensure_ascii=False,
|
||||
)
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user