Compare commits

...
16 Commits
Author SHA1 Message Date
OthmanAdi 57fe376da9 release: v3.20.3
A symlinked or junctioned directory under .planning/ is never a plan on
any route (#270, PR #271 by @ShaunLinTW plus three maintainer commits).

Parity set bumped to 3.20.3 with scripts/bump-version.py. CHANGELOG,
CONTRIBUTORS.md (PR #271 for Shaun Lin), README releases row.
2026-09-19 11:24:08 +02:00
OthmanAdi 663908180e docs(hermes): name the routes that share the linked-directory rule 2026-09-19 11:23:53 +02:00
OthmanAdi f54f8144c2 fix(scripts): match symlinks and junctions only, and keep linked directories out of set-active-plan
Review of the previous two commits found the PowerShell resolver testing the
ReparsePoint attribute, which every OneDrive Files On-Demand directory
carries: a project under OneDrive would have lost every plan on the Cursor
route. The resolver now tests LinkType for SymbolicLink or Junction, the
exact `[ -L ]` of the shell scripts and is_link of the Python twin, and the
Codex counter uses the same symlink-or-junction tag rule instead of the
adapter's any-reparse helper.

set-active-plan.sh and set-active-plan.ps1 refuse to point the shared
default at a linked directory and leave it out of --list, since no route
selects it; the sh/py/ps1 suites cover PLAN_ID naming a link (refused with
the existing notice) and the pointer naming one (falls through to the real
plan like a stale pointer). Hermes docstring names the routes precisely (#270).
2026-09-19 11:13:08 +02:00
OthmanAdi 95cf6f499b fix(adapters): skip linked plan directories in the Codex, OpenCode and DSH plan counters
The Codex adapter's session_plan_requires_binding and the shared
countSelectablePlans of the OpenCode and DeepSeek Harness plugins counted a
symlinked or junctioned plan directory although their selection paths (and
the shell family since the previous commit) refuse it. A linked directory
never counts now, so the several-plans notice fires on the same trees on
every route. The two TypeScript cores stay byte-identical (#270).
2026-09-19 10:44:07 +02:00
OthmanAdi 0308a2f819 fix(scripts): a linked plan directory is never selectable, on every shell-family route
PR #271 made the several-plans counters in inject-plan.sh and
resolve-plan-dir.sh skip symlinked and junctioned plan directories, matching
the Hermes plugin. Skipping the link in the counter alone left the selection
paths following it through containment: one real plan plus a newer linked
one counted as one plan and the newest-mtime scan then selected the linked
directory, the mtime guess the #240 rule exists to prevent. The PowerShell
twin reproduced that after the counter port.

The rule now holds end to end in the shell family: resolve-plan-dir.sh,
inject-plan.sh, resolve-plan-dir.ps1 and the Python twin inject-plan.py
refuse a linked plan directory in the PLAN_ID, .active_plan and
newest-mtime branches and never count it. Every shipped copy is synced.

Tests: the sh/py parity suite gains the linked-directory fixture (the twin
contract), and test_unarmed_plan_ambiguity drives both resolvers and both
injectors over a real plan plus a junction or symlink (#270).
2026-09-19 10:43:59 +02:00
Shaun Lin 0bbc43cff3 fix: skip linked plan dirs in ambiguity counts 2026-09-19 10:36:51 +02:00
OthmanAdi f01a88a12b release: v3.20.2
Hermes plugin 0.2.2: the launch-directory notice for the Hermes 0.21.3
first-turn TERMINAL_CWD rewrite, the /pwf-status and /pwf diagnostics,
and PWF_PLAN_ROOT honored by the slash commands (#272).

Parity set bumped to 3.20.2 with scripts/bump-version.py. CHANGELOG,
CONTRIBUTORS.md (@ericshunhinglee-cloud), README releases row,
CITATION.cff date.
2026-09-19 09:59:30 +02:00
OthmanAdi 9a3843b31d docs(hermes): describe the Hermes 0.21.3 working-directory rewrite and the pin
Adds the section on the first-turn TERMINAL_CWD rewrite: the mechanism,
what was reproduced with the 0.21.0 source, what the plugin says since
v3.20.2, the PWF_PLAN_ROOT pin for project-scoped CLI sessions, the
shell-hook route as the unaffected alternative, and the home-directory
inverse risk (#272).
2026-09-19 09:57:44 +02:00
OthmanAdi 1528b31d7f fix(hermes): name the launch directory plan when the host re-homes the working directory
On Hermes 0.21.3 the first turn of a CLI session rewrites the
process-global TERMINAL_CWD to the home directory (agent/relay_runtime.py
imports gateway/run.py lazily, whose import-time bridge applies the
Path.home() fallback), so resolve_agent_cwd() names HOME, the hooks find
no plan there and inject nothing. The rewrite runs before the first
plugin hook, so the plugin cannot recover the root and does not guess.

pre_llm_call now injects one line naming the resolved directory, the
launch directory that holds a plan, and the PWF_PLAN_ROOT pin instead of
returning nothing. CLI only; silent for hermes -w worktree sessions
(TERMINAL_CWD at <repo>/.worktrees/<name> without a chdir is intended),
for a launch directory without planning state, and for a launch
directory whose session isolation refuses the session.

/pwf and /pwf-status honor PWF_PLAN_ROOT like the hooks and report a pin
that does not resolve instead of acting in the directory Hermes named.
/pwf-status prints the same line under "No planning files found", and
/pwf appends it when the plan it created went somewhere other than a
launch directory that already holds one.

Fixes #272. Upstream: NousResearch/hermes-agent#86411, #95577.
2026-09-19 09:57:38 +02:00
OthmanAdi faf1a15a7d release: v3.20.1 2026-09-18 17:32:57 +02:00
OthmanAdi c05821a1cf fix(init): bind the attest selectors in slug mode only, clear them in root mode
Binding PWF_PLAN_ROOT for the attestation call in both modes (#265) made
root-mode --autonomous and --gated plans unattested on the shell and the
PowerShell route: the attester only falls back to the legacy ./task_plan.md
when no selector is set and refuses the root plan under an explicit pin,
while init still reported the plan as attested and every hook then refused
to inject it. Slug mode keeps the binding from #265 (PWF_PLAN_ROOT and
PLAN_ID name the plan just created); root mode now clears both selectors,
which also stops an inherited PLAN_ID from redirecting the shell attester
to a sibling slug plan, as the PowerShell twin already did (#261).

Regression tests cover root-mode attestation for --autonomous and --gated
with and without an inherited PWF_PLAN_ROOT and PLAN_ID, on both routes.
2026-09-18 17:32:57 +02:00
kuei51307-hub 52572e3301 docs(hermes): clarify multiple-plan selection 2026-09-18 17:32:09 +02:00
kuei51307-hub 1df6f5808b fix(hermes): require selector for multiple plans 2026-09-18 17:32:09 +02:00
TayfurYldz d03002bcee fix: normalize multiline plan slugs 2026-09-18 17:31:54 +02:00
TayfurYldz 1bea197584 fix: bind init attestation to current project 2026-09-18 17:31:38 +02:00
Shaun Lin e33359977c fix(catchup): skip malformed OpenCode parts 2026-09-18 17:31:18 +02:00
173 changed files with 2373 additions and 371 deletions
+1 -1
View File
@@ -28,7 +28,7 @@ hooks:
- type: command
command: "SH=\"${CLAUDE_SKILL_DIR}/scripts/skill-hook.sh\"; [ -f \"$SH\" ] || SH=$(ls \"$HOME/.claude/skills/planning-with-files/scripts/skill-hook.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/skill-hook.sh\" 2>/dev/null | head -1); [ -n \"$SH\" ] && [ -f \"$SH\" ] && sh \"$SH\" --event=precompact; exit 0"
metadata:
version: "3.20.0"
version: "3.20.3"
---
# Planning with Files
@@ -350,16 +350,23 @@ if ($Mode -ne "") {
# (c) auto-attest (attestation default-on in v3 modes, security strand rec 1).
# attest-plan.ps1 intentionally refuses non-Windows hosts because its secure
# no-follow implementation uses Win32 handles. On Unix, use the POSIX
# attester instead. Bind slug mode to the plan we just created so an
# inherited PLAN_ID cannot redirect attestation to another plan.
# attester instead. Slug mode binds PWF_PLAN_ROOT and PLAN_ID to the plan
# we just created so an inherited pin or slug cannot redirect attestation
# to another project or plan (#261, #237). Root mode clears both instead:
# the attester only falls back to the legacy ./task_plan.md when no
# selector is set, and a bound pin would make it refuse the root plan.
$PlanFilePwf = Join-Path $PlanDirPwf "task_plan.md"
if (Test-Path -LiteralPath $PlanFilePwf) {
$HadPlanId = Test-Path Env:PLAN_ID
$PreviousPlanId = $env:PLAN_ID
$HadPlanRoot = Test-Path Env:PWF_PLAN_ROOT
$PreviousPlanRoot = $env:PWF_PLAN_ROOT
try {
if ($UsePlanDir) {
$env:PWF_PLAN_ROOT = (Get-Location).Path
$env:PLAN_ID = $PlanId
} else {
Remove-Item Env:PWF_PLAN_ROOT -ErrorAction SilentlyContinue
Remove-Item Env:PLAN_ID -ErrorAction SilentlyContinue
}
@@ -384,6 +391,11 @@ if ($Mode -ne "") {
} else {
Remove-Item Env:PLAN_ID -ErrorAction SilentlyContinue
}
if ($HadPlanRoot) {
$env:PWF_PLAN_ROOT = $PreviousPlanRoot
} else {
Remove-Item Env:PWF_PLAN_ROOT -ErrorAction SilentlyContinue
}
}
}
@@ -103,6 +103,7 @@ slugify() {
# Lowercase, non-alphanumerics → '-', collapse repeats, trim leading/trailing '-'
printf '%s' "$1" \
| tr '[:upper:]' '[:lower:]' \
| tr '\r\n' '--' \
| sed -e 's/[^a-z0-9]/-/g' -e 's/-\{2,\}/-/g' -e 's/^-//' -e 's/-$//' \
| cut -c1-40
}
@@ -202,12 +203,20 @@ apply_v3_mode() {
# (c) auto-attest the plan (attestation default-on in v3 modes, security
# strand rec 1). attest-plan.sh resolves the same way init-session just
# pinned things: in slug mode PLAN_ID points at this plan dir; in legacy
# mode it is empty and the script falls back to ./task_plan.md at root.
# Run from the project root (CWD here) so both resolutions land.
# pinned things. Slug mode binds both selectors to the plan that was
# just created, so an inherited PWF_PLAN_ROOT or PLAN_ID cannot
# redirect attestation to another project or plan (#261, #237). Root
# mode clears both instead: the attester only falls back to the legacy
# ./task_plan.md when no selector is set, and a bound pin would make it
# refuse the root plan. Run from the project root (CWD here) so both
# resolutions land.
_attest="${SCRIPT_DIR}/attest-plan.sh"
if [ -f "${_attest}" ] && [ -f "${_mode_plan}" ]; then
PLAN_ID="${PLAN_ID:-}" sh "${_attest}" >/dev/null 2>&1 || true
if [ "$SLUG_MODE" -eq 1 ]; then
PWF_PLAN_ROOT="$PWD" PLAN_ID="${PLAN_ID}" sh "${_attest}" >/dev/null 2>&1 || true
else
PWF_PLAN_ROOT="" PLAN_ID="" sh "${_attest}" >/dev/null 2>&1 || true
fi
fi
}
@@ -845,7 +845,10 @@ class Injector(object):
)
raise Bail()
if plan_id:
if slug_is_valid(plan_id) and is_dir(plan_prefix + ".planning/" + plan_id):
# A linked plan directory is never selectable (#270): the same
# `[ ! -L ]` the reference applies on every branch below.
if (slug_is_valid(plan_id) and is_dir(plan_prefix + ".planning/" + plan_id)
and not is_link(plan_prefix + ".planning/" + plan_id)):
resolved = plan_prefix + ".planning/" + plan_id
scope = "scoped"
explicit = True
@@ -864,7 +867,7 @@ class Injector(object):
active = b""
if active and slug_is_valid(active):
slug = active.decode("ascii")
if is_dir(plan_prefix + ".planning/" + slug):
if is_dir(plan_prefix + ".planning/" + slug) and not is_link(plan_prefix + ".planning/" + slug):
resolved = plan_prefix + ".planning/" + slug
scope = "scoped"
if not resolved and is_dir(plan_prefix + ".planning"):
@@ -880,6 +883,8 @@ class Injector(object):
candidate = plan_prefix + ".planning/" + name
if not is_dir(candidate):
continue
if is_link(candidate):
continue
if not slug_is_valid(name):
continue
if not is_file(candidate + "/task_plan.md"):
@@ -1327,7 +1332,12 @@ def plan_is_ambiguous(plan_root, project_root, plan_id=""):
except OSError:
names = []
for name in names:
if slug_is_valid(name) and is_file(plan_root + "/" + name + "/task_plan.md"):
candidate_dir = plan_root + "/" + name
# A linked plan directory is not selectable, so it never counts (#270):
# the reference tests `[ -L "$plan_candidate_dir" ]` before `-f`.
if is_link(candidate_dir):
continue
if slug_is_valid(name) and is_file(candidate_dir + "/task_plan.md"):
count += 1
if count > 1:
return True
@@ -1364,7 +1374,7 @@ def resolve_plan_dir(env=None):
if plan_id:
if slug_is_valid(plan_id):
candidate = fs_root + "/" + plan_id
if is_dir(candidate) and within(candidate):
if is_dir(candidate) and not is_link(candidate) and within(candidate):
return found(plan_id)
return ("", "")
@@ -1382,7 +1392,7 @@ def resolve_plan_dir(env=None):
if slug_is_valid(active):
slug = active.decode("ascii")
candidate = fs_root + "/" + slug
if is_dir(candidate) and within(candidate):
if is_dir(candidate) and not is_link(candidate) and within(candidate):
return found(slug)
if is_dir(fs_root):
@@ -1398,6 +1408,8 @@ def resolve_plan_dir(env=None):
continue
if name.startswith("."):
continue
if is_link(candidate):
continue
if not slug_is_valid(name):
continue
if not is_file(candidate + "/task_plan.md"):
@@ -263,8 +263,9 @@ if [ -z "${PLAN_ID:-}" ]; then
PLAN_COUNT=1
fi
for plan_candidate in "${PLAN_PREFIX}".planning/*/task_plan.md; do
[ -f "$plan_candidate" ] || continue
plan_candidate_dir="${plan_candidate%/task_plan.md}"
[ -L "$plan_candidate_dir" ] && continue
[ -f "$plan_candidate" ] || continue
slug_is_valid "${plan_candidate_dir##*/}" || continue
PLAN_COUNT=$((PLAN_COUNT + 1))
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
@@ -295,7 +296,9 @@ if [ -n "${PLAN_ID:-}" ]; then
# 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
# A linked plan directory is never selectable (#270): same `-L` rule as
# the counter above and as resolve-plan-dir.sh, on every branch below.
if slug_is_valid "$PLAN_ID" && [ -d "${PLAN_PREFIX}.planning/${PLAN_ID}" ] && [ ! -L "${PLAN_PREFIX}.planning/${PLAN_ID}" ]; then
RESOLVED="${PLAN_PREFIX}.planning/${PLAN_ID}"; SCOPE="scoped"; EXPLICIT=1
else
if [ "$CONTEXT" = "userprompt" ]; then
@@ -305,7 +308,7 @@ if [ -n "${PLAN_ID:-}" ]; then
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
if [ -n "$AP" ] && slug_is_valid "$AP" && [ -d "${PLAN_PREFIX}.planning/${AP}" ] && [ ! -L "${PLAN_PREFIX}.planning/${AP}" ]; then
RESOLVED="${PLAN_PREFIX}.planning/${AP}"; SCOPE="scoped"
fi
fi
@@ -314,6 +317,7 @@ if [ -z "$RESOLVED" ] && [ -d "${PLAN_PREFIX}.planning" ]; then
for d in "${PLAN_PREFIX}".planning/*/; do
d="${d%/}"; n="${d##*/}"
case "$n" in .*) continue;; esac
[ -L "$d" ] && continue
slug_is_valid "$n" || continue
[ -f "$d/task_plan.md" ] || continue
m=$(stat -c '%Y' "$d" 2>/dev/null || stat -f '%m' "$d" 2>/dev/null || date -r "$d" +%s 2>/dev/null || echo 0)
@@ -139,6 +139,23 @@ function Test-WithinRoot {
return $candNorm.StartsWith($rootNorm + [System.IO.Path]::DirectorySeparatorChar, [System.StringComparison]::OrdinalIgnoreCase)
}
# A linked plan directory (symlink or junction) is never selectable: not by
# PLAN_ID, not by the pointer, not by the newest scan, and it never counts
# (#270). This is `[ -L ]` of resolve-plan-dir.sh and is_link of the Python
# twin: LinkType names symlinks and junctions only. The ReparsePoint
# attribute alone would also match OneDrive Files On-Demand placeholders,
# which every synced directory carries and which are not links to sh.
function Test-LinkedDirectory {
param($PathOrItem)
if ($PathOrItem -is [string]) {
$item = Get-Item -LiteralPath $PathOrItem -Force -ErrorAction SilentlyContinue
} else {
$item = $PathOrItem
}
if (-not $item) { return $false }
return ([string]$item.LinkType) -in @('SymbolicLink', 'Junction')
}
$activeFile = Join-Path $PlanRoot ".active_plan"
# A set PLAN_ID is a BINDING, not a hint (issue #237). A selector that names
@@ -158,6 +175,9 @@ if (-not $env:PLAN_ID) {
}
if (Test-Path -LiteralPath $PlanRoot -PathType Container) {
foreach ($entry in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue)) {
# A linked plan directory (symlink, junction) is not selectable and
# never counts, matching `[ -L ]` in resolve-plan-dir.sh (#270).
if (Test-LinkedDirectory $entry) { continue }
if ((Test-ValidSlug $entry.Name) -and
(Test-Path -LiteralPath (Join-Path $entry.FullName "task_plan.md") -PathType Leaf)) {
$planCount++
@@ -175,7 +195,7 @@ if ($planCount -gt 1) { exit 0 }
if ($env:PLAN_ID) {
if (Test-ValidSlug $env:PLAN_ID) {
$candidate = Join-Path $PlanRoot $env:PLAN_ID
if ((Test-Path -LiteralPath $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
if ((Test-Path -LiteralPath $candidate -PathType Container) -and -not (Test-LinkedDirectory $candidate) -and (Test-WithinRoot $candidate)) {
Write-Output $candidate
exit 0
}
@@ -198,7 +218,7 @@ if ($activeItem) {
$planId = "$(Get-Content -LiteralPath $activeFile -Raw -ErrorAction SilentlyContinue)".Trim()
if ($planId -and (Test-ValidSlug $planId)) {
$candidate = Join-Path $PlanRoot $planId
if ((Test-Path -LiteralPath $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
if ((Test-Path -LiteralPath $candidate -PathType Container) -and -not (Test-LinkedDirectory $candidate) -and (Test-WithinRoot $candidate)) {
Write-Output $candidate
exit 0
}
@@ -211,6 +231,7 @@ if ($activeItem) {
if (Test-Path -LiteralPath $PlanRoot -PathType Container) {
$latest = Get-ChildItem -LiteralPath $PlanRoot -Directory |
Where-Object { -not $_.Name.StartsWith('.') } |
Where-Object { -not (Test-LinkedDirectory $_) } |
Where-Object { Test-ValidSlug $_.Name } |
Where-Object { Test-Path -LiteralPath (Join-Path $_.FullName "task_plan.md") -PathType Leaf } |
Where-Object { Test-WithinRoot $_.FullName } |
@@ -246,10 +246,16 @@ mtime_of() {
printf "0\n"
}
# A linked plan directory (symlink or junction; `-L` sees both under Git
# Bash) is never selectable: not by PLAN_ID, not by the pointer, not by the
# newest-mtime scan, and it never counts below (#270). Containment alone let
# a link that stays inside the root be selected while the counter skipped
# it, so one real plan plus a newer linked one became an mtime guess again.
resolve_from_env() {
plan_id="${PLAN_ID:-}"
slug_is_valid "${plan_id}" || return 1
candidate="${PLAN_ROOT}/${plan_id}"
[ -L "${candidate}" ] && return 1
if [ -d "${candidate}" ] && is_within_root "${candidate}"; then
printf "%s\n" "${candidate}"
return 0
@@ -268,6 +274,7 @@ resolve_from_active_file() {
esac
slug_is_valid "${plan_id}" || return 1
candidate="${PLAN_ROOT}/${plan_id}"
[ -L "${candidate}" ] && return 1
if [ -d "${candidate}" ] && is_within_root "${candidate}"; then
printf "%s\n" "${candidate}"
return 0
@@ -288,6 +295,7 @@ resolve_latest_dir() {
case "${name}" in
.*) continue ;;
esac
[ -L "${clean}" ] && continue
slug_is_valid "${name}" || continue
[ -f "${clean}/task_plan.md" ] || continue
is_within_root "${clean}" || continue
@@ -338,8 +346,9 @@ if [ -z "${PLAN_ID:-}" ]; then
PLAN_COUNT=1
fi
for plan_candidate in "${PLAN_ROOT}"/*/task_plan.md; do
[ -f "$plan_candidate" ] || continue
plan_candidate_dir="${plan_candidate%/task_plan.md}"
[ -L "$plan_candidate_dir" ] && continue
[ -f "$plan_candidate" ] || continue
slug_is_valid "${plan_candidate_dir##*/}" || continue
PLAN_COUNT=$((PLAN_COUNT + 1))
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
@@ -474,7 +474,7 @@ def _format_opencode_part(data: Dict[str, Any], session_id: str) -> Optional[Dic
tool = (data.get('tool') or '').lower()
state = data.get('state') or {}
input_ = state.get('input') if isinstance(state, dict) else None
input_ = input_ or {}
input_ = input_ if isinstance(input_, dict) else {}
outcome = _opencode_state_annotation(state)
if tool in ('write', 'edit'):
fp = input_.get('filePath', '')
@@ -577,6 +577,7 @@ def opencode_catchup(project_path: str, mode: str = 'no-history') -> None:
"""
SELECT time_created, data FROM part
WHERE session_id = ?
AND json_valid(data)
AND json_extract(data, '$.type') = 'tool'
AND lower(json_extract(data, '$.tool')) IN ('write', 'edit', 'patch')
AND (
@@ -204,6 +204,8 @@ function Show-PlanList {
Write-Output "[active] marks the shared .active_plan pointer; listing does not bind this session."
$found = $false
foreach ($plan in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue | Sort-Object Name)) {
# A linked plan directory is never a plan (#270): no resolver selects it.
if (([string]$plan.LinkType) -in @('SymbolicLink', 'Junction')) { continue }
if (-not (Test-ValidSlug $plan.Name) -or -not (Test-WithinRoot $plan.FullName)) { continue }
$planFile = Join-Path $plan.FullName "task_plan.md"
if (-not (Test-Path -LiteralPath $planFile -PathType Leaf) -or -not (Test-WithinRoot $planFile)) { continue }
@@ -281,6 +283,11 @@ if (-not (Test-Path -LiteralPath $PlanDir -PathType Container)) {
Write-Error "Run: init-session.sh `"$PlanId`" to create it, or check .planning\ for available plans."
exit 1
}
$planDirItem = Get-Item -LiteralPath $PlanDir -Force -ErrorAction SilentlyContinue
if ($planDirItem -and (([string]$planDirItem.LinkType) -in @('SymbolicLink', 'Junction'))) {
Write-Error "Error: plan directory is a symlink or junction and no route selects it: $PlanDir"
exit 1
}
if (-not (Test-WithinRoot $PlanRoot) -or -not (Test-WithinRoot $PlanDir)) {
Write-Error "Error: plan directory must remain within the project."
exit 1
@@ -272,6 +272,9 @@ list_plans() {
printf '%s\n' 'Available plans:'
for _dir in "${PLAN_ROOT}"/*; do
[ -d "${_dir}" ] || continue
# A linked plan directory is never a plan (#270): no resolver selects
# it, so listing it would advertise a PLAN_ID every route refuses.
[ -L "${_dir}" ] && continue
_id="${_dir##*/}"
slug_is_valid "${_id}" || continue
is_within_root "${_dir}" || continue
@@ -312,7 +315,7 @@ if [ "${1:-}" = '' ]; then
exit 1
fi
plan_id="$(current_active)"
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ] && is_within_root "${PLAN_ROOT}/${plan_id}"; then
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ] && [ ! -L "${PLAN_ROOT}/${plan_id}" ] && is_within_root "${PLAN_ROOT}/${plan_id}"; then
printf '%s\n' "Active plan: ${plan_id}" "Path: ${PLAN_ROOT}/${plan_id}"
elif [ -n "${plan_id}" ]; then
printf '%s\n' "Active plan pointer: ${plan_id} (directory not found or outside project - stale pointer)"
@@ -333,6 +336,10 @@ if [ ! -d "${PLAN_DIR}" ]; then
"Run: init-session.sh \"${PLAN_ID}\" to create it, or use --list to see available plans." >&2
exit 1
fi
if [ -L "${PLAN_DIR}" ]; then
printf '%s\n' "Error: plan directory is a symlink or junction and no route selects it: ${PLAN_DIR}" >&2
exit 1
fi
if ! is_within_root "${PLAN_ROOT}" || ! is_within_root "${PLAN_DIR}"; then
printf '%s\n' 'Error: plan directory is outside the project or cannot be verified.' >&2
exit 1
+1 -1
View File
@@ -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.20.0"
"version": "3.20.3"
}
]
}
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "planning-with-files",
"version": "3.20.0",
"version": "3.20.3",
"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}/skill-hook.sh\" \"${CLAUDE_SKILL_DIR}/scripts/skill-hook.sh\" \"${CODEBUDDY_PLUGIN_ROOT}/scripts/skill-hook.sh\" \"$HOME/.codebuddy/skills/planning-with-files/scripts/skill-hook.sh\" \"$HOME/.claude/skills/planning-with-files/scripts/skill-hook.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/skill-hook.sh\"; do [ -f \"$c\" ] && { SH=\"$c\"; break; }; done; [ -n \"$SH\" ] && sh \"$SH\" --event=precompact; exit 0"
metadata:
version: "3.20.0"
version: "3.20.3"
---
@@ -350,16 +350,23 @@ if ($Mode -ne "") {
# (c) auto-attest (attestation default-on in v3 modes, security strand rec 1).
# attest-plan.ps1 intentionally refuses non-Windows hosts because its secure
# no-follow implementation uses Win32 handles. On Unix, use the POSIX
# attester instead. Bind slug mode to the plan we just created so an
# inherited PLAN_ID cannot redirect attestation to another plan.
# attester instead. Slug mode binds PWF_PLAN_ROOT and PLAN_ID to the plan
# we just created so an inherited pin or slug cannot redirect attestation
# to another project or plan (#261, #237). Root mode clears both instead:
# the attester only falls back to the legacy ./task_plan.md when no
# selector is set, and a bound pin would make it refuse the root plan.
$PlanFilePwf = Join-Path $PlanDirPwf "task_plan.md"
if (Test-Path -LiteralPath $PlanFilePwf) {
$HadPlanId = Test-Path Env:PLAN_ID
$PreviousPlanId = $env:PLAN_ID
$HadPlanRoot = Test-Path Env:PWF_PLAN_ROOT
$PreviousPlanRoot = $env:PWF_PLAN_ROOT
try {
if ($UsePlanDir) {
$env:PWF_PLAN_ROOT = (Get-Location).Path
$env:PLAN_ID = $PlanId
} else {
Remove-Item Env:PWF_PLAN_ROOT -ErrorAction SilentlyContinue
Remove-Item Env:PLAN_ID -ErrorAction SilentlyContinue
}
@@ -384,6 +391,11 @@ if ($Mode -ne "") {
} else {
Remove-Item Env:PLAN_ID -ErrorAction SilentlyContinue
}
if ($HadPlanRoot) {
$env:PWF_PLAN_ROOT = $PreviousPlanRoot
} else {
Remove-Item Env:PWF_PLAN_ROOT -ErrorAction SilentlyContinue
}
}
}
@@ -103,6 +103,7 @@ slugify() {
# Lowercase, non-alphanumerics → '-', collapse repeats, trim leading/trailing '-'
printf '%s' "$1" \
| tr '[:upper:]' '[:lower:]' \
| tr '\r\n' '--' \
| sed -e 's/[^a-z0-9]/-/g' -e 's/-\{2,\}/-/g' -e 's/^-//' -e 's/-$//' \
| cut -c1-40
}
@@ -202,12 +203,20 @@ apply_v3_mode() {
# (c) auto-attest the plan (attestation default-on in v3 modes, security
# strand rec 1). attest-plan.sh resolves the same way init-session just
# pinned things: in slug mode PLAN_ID points at this plan dir; in legacy
# mode it is empty and the script falls back to ./task_plan.md at root.
# Run from the project root (CWD here) so both resolutions land.
# pinned things. Slug mode binds both selectors to the plan that was
# just created, so an inherited PWF_PLAN_ROOT or PLAN_ID cannot
# redirect attestation to another project or plan (#261, #237). Root
# mode clears both instead: the attester only falls back to the legacy
# ./task_plan.md when no selector is set, and a bound pin would make it
# refuse the root plan. Run from the project root (CWD here) so both
# resolutions land.
_attest="${SCRIPT_DIR}/attest-plan.sh"
if [ -f "${_attest}" ] && [ -f "${_mode_plan}" ]; then
PLAN_ID="${PLAN_ID:-}" sh "${_attest}" >/dev/null 2>&1 || true
if [ "$SLUG_MODE" -eq 1 ]; then
PWF_PLAN_ROOT="$PWD" PLAN_ID="${PLAN_ID}" sh "${_attest}" >/dev/null 2>&1 || true
else
PWF_PLAN_ROOT="" PLAN_ID="" sh "${_attest}" >/dev/null 2>&1 || true
fi
fi
}
@@ -845,7 +845,10 @@ class Injector(object):
)
raise Bail()
if plan_id:
if slug_is_valid(plan_id) and is_dir(plan_prefix + ".planning/" + plan_id):
# A linked plan directory is never selectable (#270): the same
# `[ ! -L ]` the reference applies on every branch below.
if (slug_is_valid(plan_id) and is_dir(plan_prefix + ".planning/" + plan_id)
and not is_link(plan_prefix + ".planning/" + plan_id)):
resolved = plan_prefix + ".planning/" + plan_id
scope = "scoped"
explicit = True
@@ -864,7 +867,7 @@ class Injector(object):
active = b""
if active and slug_is_valid(active):
slug = active.decode("ascii")
if is_dir(plan_prefix + ".planning/" + slug):
if is_dir(plan_prefix + ".planning/" + slug) and not is_link(plan_prefix + ".planning/" + slug):
resolved = plan_prefix + ".planning/" + slug
scope = "scoped"
if not resolved and is_dir(plan_prefix + ".planning"):
@@ -880,6 +883,8 @@ class Injector(object):
candidate = plan_prefix + ".planning/" + name
if not is_dir(candidate):
continue
if is_link(candidate):
continue
if not slug_is_valid(name):
continue
if not is_file(candidate + "/task_plan.md"):
@@ -1327,7 +1332,12 @@ def plan_is_ambiguous(plan_root, project_root, plan_id=""):
except OSError:
names = []
for name in names:
if slug_is_valid(name) and is_file(plan_root + "/" + name + "/task_plan.md"):
candidate_dir = plan_root + "/" + name
# A linked plan directory is not selectable, so it never counts (#270):
# the reference tests `[ -L "$plan_candidate_dir" ]` before `-f`.
if is_link(candidate_dir):
continue
if slug_is_valid(name) and is_file(candidate_dir + "/task_plan.md"):
count += 1
if count > 1:
return True
@@ -1364,7 +1374,7 @@ def resolve_plan_dir(env=None):
if plan_id:
if slug_is_valid(plan_id):
candidate = fs_root + "/" + plan_id
if is_dir(candidate) and within(candidate):
if is_dir(candidate) and not is_link(candidate) and within(candidate):
return found(plan_id)
return ("", "")
@@ -1382,7 +1392,7 @@ def resolve_plan_dir(env=None):
if slug_is_valid(active):
slug = active.decode("ascii")
candidate = fs_root + "/" + slug
if is_dir(candidate) and within(candidate):
if is_dir(candidate) and not is_link(candidate) and within(candidate):
return found(slug)
if is_dir(fs_root):
@@ -1398,6 +1408,8 @@ def resolve_plan_dir(env=None):
continue
if name.startswith("."):
continue
if is_link(candidate):
continue
if not slug_is_valid(name):
continue
if not is_file(candidate + "/task_plan.md"):
@@ -263,8 +263,9 @@ if [ -z "${PLAN_ID:-}" ]; then
PLAN_COUNT=1
fi
for plan_candidate in "${PLAN_PREFIX}".planning/*/task_plan.md; do
[ -f "$plan_candidate" ] || continue
plan_candidate_dir="${plan_candidate%/task_plan.md}"
[ -L "$plan_candidate_dir" ] && continue
[ -f "$plan_candidate" ] || continue
slug_is_valid "${plan_candidate_dir##*/}" || continue
PLAN_COUNT=$((PLAN_COUNT + 1))
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
@@ -295,7 +296,9 @@ if [ -n "${PLAN_ID:-}" ]; then
# 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
# A linked plan directory is never selectable (#270): same `-L` rule as
# the counter above and as resolve-plan-dir.sh, on every branch below.
if slug_is_valid "$PLAN_ID" && [ -d "${PLAN_PREFIX}.planning/${PLAN_ID}" ] && [ ! -L "${PLAN_PREFIX}.planning/${PLAN_ID}" ]; then
RESOLVED="${PLAN_PREFIX}.planning/${PLAN_ID}"; SCOPE="scoped"; EXPLICIT=1
else
if [ "$CONTEXT" = "userprompt" ]; then
@@ -305,7 +308,7 @@ if [ -n "${PLAN_ID:-}" ]; then
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
if [ -n "$AP" ] && slug_is_valid "$AP" && [ -d "${PLAN_PREFIX}.planning/${AP}" ] && [ ! -L "${PLAN_PREFIX}.planning/${AP}" ]; then
RESOLVED="${PLAN_PREFIX}.planning/${AP}"; SCOPE="scoped"
fi
fi
@@ -314,6 +317,7 @@ if [ -z "$RESOLVED" ] && [ -d "${PLAN_PREFIX}.planning" ]; then
for d in "${PLAN_PREFIX}".planning/*/; do
d="${d%/}"; n="${d##*/}"
case "$n" in .*) continue;; esac
[ -L "$d" ] && continue
slug_is_valid "$n" || continue
[ -f "$d/task_plan.md" ] || continue
m=$(stat -c '%Y' "$d" 2>/dev/null || stat -f '%m' "$d" 2>/dev/null || date -r "$d" +%s 2>/dev/null || echo 0)
@@ -139,6 +139,23 @@ function Test-WithinRoot {
return $candNorm.StartsWith($rootNorm + [System.IO.Path]::DirectorySeparatorChar, [System.StringComparison]::OrdinalIgnoreCase)
}
# A linked plan directory (symlink or junction) is never selectable: not by
# PLAN_ID, not by the pointer, not by the newest scan, and it never counts
# (#270). This is `[ -L ]` of resolve-plan-dir.sh and is_link of the Python
# twin: LinkType names symlinks and junctions only. The ReparsePoint
# attribute alone would also match OneDrive Files On-Demand placeholders,
# which every synced directory carries and which are not links to sh.
function Test-LinkedDirectory {
param($PathOrItem)
if ($PathOrItem -is [string]) {
$item = Get-Item -LiteralPath $PathOrItem -Force -ErrorAction SilentlyContinue
} else {
$item = $PathOrItem
}
if (-not $item) { return $false }
return ([string]$item.LinkType) -in @('SymbolicLink', 'Junction')
}
$activeFile = Join-Path $PlanRoot ".active_plan"
# A set PLAN_ID is a BINDING, not a hint (issue #237). A selector that names
@@ -158,6 +175,9 @@ if (-not $env:PLAN_ID) {
}
if (Test-Path -LiteralPath $PlanRoot -PathType Container) {
foreach ($entry in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue)) {
# A linked plan directory (symlink, junction) is not selectable and
# never counts, matching `[ -L ]` in resolve-plan-dir.sh (#270).
if (Test-LinkedDirectory $entry) { continue }
if ((Test-ValidSlug $entry.Name) -and
(Test-Path -LiteralPath (Join-Path $entry.FullName "task_plan.md") -PathType Leaf)) {
$planCount++
@@ -175,7 +195,7 @@ if ($planCount -gt 1) { exit 0 }
if ($env:PLAN_ID) {
if (Test-ValidSlug $env:PLAN_ID) {
$candidate = Join-Path $PlanRoot $env:PLAN_ID
if ((Test-Path -LiteralPath $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
if ((Test-Path -LiteralPath $candidate -PathType Container) -and -not (Test-LinkedDirectory $candidate) -and (Test-WithinRoot $candidate)) {
Write-Output $candidate
exit 0
}
@@ -198,7 +218,7 @@ if ($activeItem) {
$planId = "$(Get-Content -LiteralPath $activeFile -Raw -ErrorAction SilentlyContinue)".Trim()
if ($planId -and (Test-ValidSlug $planId)) {
$candidate = Join-Path $PlanRoot $planId
if ((Test-Path -LiteralPath $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
if ((Test-Path -LiteralPath $candidate -PathType Container) -and -not (Test-LinkedDirectory $candidate) -and (Test-WithinRoot $candidate)) {
Write-Output $candidate
exit 0
}
@@ -211,6 +231,7 @@ if ($activeItem) {
if (Test-Path -LiteralPath $PlanRoot -PathType Container) {
$latest = Get-ChildItem -LiteralPath $PlanRoot -Directory |
Where-Object { -not $_.Name.StartsWith('.') } |
Where-Object { -not (Test-LinkedDirectory $_) } |
Where-Object { Test-ValidSlug $_.Name } |
Where-Object { Test-Path -LiteralPath (Join-Path $_.FullName "task_plan.md") -PathType Leaf } |
Where-Object { Test-WithinRoot $_.FullName } |
@@ -246,10 +246,16 @@ mtime_of() {
printf "0\n"
}
# A linked plan directory (symlink or junction; `-L` sees both under Git
# Bash) is never selectable: not by PLAN_ID, not by the pointer, not by the
# newest-mtime scan, and it never counts below (#270). Containment alone let
# a link that stays inside the root be selected while the counter skipped
# it, so one real plan plus a newer linked one became an mtime guess again.
resolve_from_env() {
plan_id="${PLAN_ID:-}"
slug_is_valid "${plan_id}" || return 1
candidate="${PLAN_ROOT}/${plan_id}"
[ -L "${candidate}" ] && return 1
if [ -d "${candidate}" ] && is_within_root "${candidate}"; then
printf "%s\n" "${candidate}"
return 0
@@ -268,6 +274,7 @@ resolve_from_active_file() {
esac
slug_is_valid "${plan_id}" || return 1
candidate="${PLAN_ROOT}/${plan_id}"
[ -L "${candidate}" ] && return 1
if [ -d "${candidate}" ] && is_within_root "${candidate}"; then
printf "%s\n" "${candidate}"
return 0
@@ -288,6 +295,7 @@ resolve_latest_dir() {
case "${name}" in
.*) continue ;;
esac
[ -L "${clean}" ] && continue
slug_is_valid "${name}" || continue
[ -f "${clean}/task_plan.md" ] || continue
is_within_root "${clean}" || continue
@@ -338,8 +346,9 @@ if [ -z "${PLAN_ID:-}" ]; then
PLAN_COUNT=1
fi
for plan_candidate in "${PLAN_ROOT}"/*/task_plan.md; do
[ -f "$plan_candidate" ] || continue
plan_candidate_dir="${plan_candidate%/task_plan.md}"
[ -L "$plan_candidate_dir" ] && continue
[ -f "$plan_candidate" ] || continue
slug_is_valid "${plan_candidate_dir##*/}" || continue
PLAN_COUNT=$((PLAN_COUNT + 1))
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
@@ -474,7 +474,7 @@ def _format_opencode_part(data: Dict[str, Any], session_id: str) -> Optional[Dic
tool = (data.get('tool') or '').lower()
state = data.get('state') or {}
input_ = state.get('input') if isinstance(state, dict) else None
input_ = input_ or {}
input_ = input_ if isinstance(input_, dict) else {}
outcome = _opencode_state_annotation(state)
if tool in ('write', 'edit'):
fp = input_.get('filePath', '')
@@ -577,6 +577,7 @@ def opencode_catchup(project_path: str, mode: str = 'no-history') -> None:
"""
SELECT time_created, data FROM part
WHERE session_id = ?
AND json_valid(data)
AND json_extract(data, '$.type') = 'tool'
AND lower(json_extract(data, '$.tool')) IN ('write', 'edit', 'patch')
AND (
@@ -204,6 +204,8 @@ function Show-PlanList {
Write-Output "[active] marks the shared .active_plan pointer; listing does not bind this session."
$found = $false
foreach ($plan in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue | Sort-Object Name)) {
# A linked plan directory is never a plan (#270): no resolver selects it.
if (([string]$plan.LinkType) -in @('SymbolicLink', 'Junction')) { continue }
if (-not (Test-ValidSlug $plan.Name) -or -not (Test-WithinRoot $plan.FullName)) { continue }
$planFile = Join-Path $plan.FullName "task_plan.md"
if (-not (Test-Path -LiteralPath $planFile -PathType Leaf) -or -not (Test-WithinRoot $planFile)) { continue }
@@ -281,6 +283,11 @@ if (-not (Test-Path -LiteralPath $PlanDir -PathType Container)) {
Write-Error "Run: init-session.sh `"$PlanId`" to create it, or check .planning\ for available plans."
exit 1
}
$planDirItem = Get-Item -LiteralPath $PlanDir -Force -ErrorAction SilentlyContinue
if ($planDirItem -and (([string]$planDirItem.LinkType) -in @('SymbolicLink', 'Junction'))) {
Write-Error "Error: plan directory is a symlink or junction and no route selects it: $PlanDir"
exit 1
}
if (-not (Test-WithinRoot $PlanRoot) -or -not (Test-WithinRoot $PlanDir)) {
Write-Error "Error: plan directory must remain within the project."
exit 1
@@ -272,6 +272,9 @@ list_plans() {
printf '%s\n' 'Available plans:'
for _dir in "${PLAN_ROOT}"/*; do
[ -d "${_dir}" ] || continue
# A linked plan directory is never a plan (#270): no resolver selects
# it, so listing it would advertise a PLAN_ID every route refuses.
[ -L "${_dir}" ] && continue
_id="${_dir##*/}"
slug_is_valid "${_id}" || continue
is_within_root "${_dir}" || continue
@@ -312,7 +315,7 @@ if [ "${1:-}" = '' ]; then
exit 1
fi
plan_id="$(current_active)"
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ] && is_within_root "${PLAN_ROOT}/${plan_id}"; then
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ] && [ ! -L "${PLAN_ROOT}/${plan_id}" ] && is_within_root "${PLAN_ROOT}/${plan_id}"; then
printf '%s\n' "Active plan: ${plan_id}" "Path: ${PLAN_ROOT}/${plan_id}"
elif [ -n "${plan_id}" ]; then
printf '%s\n' "Active plan pointer: ${plan_id} (directory not found or outside project - stale pointer)"
@@ -333,6 +336,10 @@ if [ ! -d "${PLAN_DIR}" ]; then
"Run: init-session.sh \"${PLAN_ID}\" to create it, or use --list to see available plans." >&2
exit 1
fi
if [ -L "${PLAN_DIR}" ]; then
printf '%s\n' "Error: plan directory is a symlink or junction and no route selects it: ${PLAN_DIR}" >&2
exit 1
fi
if ! is_within_root "${PLAN_ROOT}" || ! is_within_root "${PLAN_DIR}"; then
printf '%s\n' 'Error: plan directory is outside the project or cannot be verified.' >&2
exit 1
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "planning-with-files",
"version": "3.20.0",
"version": "3.20.3",
"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",
+25
View File
@@ -90,6 +90,27 @@ def _is_reparse_or_link(path: Path) -> bool:
return bool(attrs & reparse)
_LINK_REPARSE_TAGS = (0xA000000C, 0xA0000003) # IO_REPARSE_TAG_SYMLINK, _MOUNT_POINT
def _is_linked_directory(path: Path) -> bool:
"""`[ -L ]` of the shell scripts: a symlink, or a junction on Windows.
Narrower than _is_reparse_or_link on purpose: OneDrive Files On-Demand
marks every synced directory as a reparse point, and those are plans.
"""
try:
info = path.lstat()
except OSError:
return False
if stat.S_ISLNK(info.st_mode):
return True
reparse = getattr(stat, "FILE_ATTRIBUTE_REPARSE_POINT", 0x400)
if getattr(info, "st_file_attributes", 0) & reparse:
return getattr(info, "st_reparse_tag", 0) in _LINK_REPARSE_TAGS
return False
def _is_trusted_darwin_system_alias(path: Path) -> bool:
"""Admit only macOS's fixed root aliases after verifying their targets."""
if sys.platform != "darwin":
@@ -243,6 +264,10 @@ def session_plan_requires_binding(root: Path) -> bool:
for child in planning_dir.iterdir():
if not _PLAN_SLUG.fullmatch(child.name) or not child.is_dir():
continue
# A linked plan directory is not selectable and never counts,
# matching `[ -L ]` in the shell counters (#270).
if _is_linked_directory(child):
continue
if (child / "task_plan.md").is_file():
candidates += 1
if candidates > 1:
+1 -1
View File
@@ -36,7 +36,7 @@ hooks:
- type: command
command: "SH=\"\"; for c in \"${PWF_SCRIPT_DIR}/skill-hook.sh\" \"${CLAUDE_SKILL_DIR}/scripts/skill-hook.sh\" \"$HOME/.codex/skills/planning-with-files/scripts/skill-hook.sh\" \"$HOME/.claude/skills/planning-with-files/scripts/skill-hook.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/skill-hook.sh\"; do [ -f \"$c\" ] && { SH=\"$c\"; break; }; done; [ -n \"$SH\" ] && sh \"$SH\" --event=precompact; exit 0"
metadata:
version: "3.20.0"
version: "3.20.3"
---
@@ -350,16 +350,23 @@ if ($Mode -ne "") {
# (c) auto-attest (attestation default-on in v3 modes, security strand rec 1).
# attest-plan.ps1 intentionally refuses non-Windows hosts because its secure
# no-follow implementation uses Win32 handles. On Unix, use the POSIX
# attester instead. Bind slug mode to the plan we just created so an
# inherited PLAN_ID cannot redirect attestation to another plan.
# attester instead. Slug mode binds PWF_PLAN_ROOT and PLAN_ID to the plan
# we just created so an inherited pin or slug cannot redirect attestation
# to another project or plan (#261, #237). Root mode clears both instead:
# the attester only falls back to the legacy ./task_plan.md when no
# selector is set, and a bound pin would make it refuse the root plan.
$PlanFilePwf = Join-Path $PlanDirPwf "task_plan.md"
if (Test-Path -LiteralPath $PlanFilePwf) {
$HadPlanId = Test-Path Env:PLAN_ID
$PreviousPlanId = $env:PLAN_ID
$HadPlanRoot = Test-Path Env:PWF_PLAN_ROOT
$PreviousPlanRoot = $env:PWF_PLAN_ROOT
try {
if ($UsePlanDir) {
$env:PWF_PLAN_ROOT = (Get-Location).Path
$env:PLAN_ID = $PlanId
} else {
Remove-Item Env:PWF_PLAN_ROOT -ErrorAction SilentlyContinue
Remove-Item Env:PLAN_ID -ErrorAction SilentlyContinue
}
@@ -384,6 +391,11 @@ if ($Mode -ne "") {
} else {
Remove-Item Env:PLAN_ID -ErrorAction SilentlyContinue
}
if ($HadPlanRoot) {
$env:PWF_PLAN_ROOT = $PreviousPlanRoot
} else {
Remove-Item Env:PWF_PLAN_ROOT -ErrorAction SilentlyContinue
}
}
}
@@ -103,6 +103,7 @@ slugify() {
# Lowercase, non-alphanumerics → '-', collapse repeats, trim leading/trailing '-'
printf '%s' "$1" \
| tr '[:upper:]' '[:lower:]' \
| tr '\r\n' '--' \
| sed -e 's/[^a-z0-9]/-/g' -e 's/-\{2,\}/-/g' -e 's/^-//' -e 's/-$//' \
| cut -c1-40
}
@@ -202,12 +203,20 @@ apply_v3_mode() {
# (c) auto-attest the plan (attestation default-on in v3 modes, security
# strand rec 1). attest-plan.sh resolves the same way init-session just
# pinned things: in slug mode PLAN_ID points at this plan dir; in legacy
# mode it is empty and the script falls back to ./task_plan.md at root.
# Run from the project root (CWD here) so both resolutions land.
# pinned things. Slug mode binds both selectors to the plan that was
# just created, so an inherited PWF_PLAN_ROOT or PLAN_ID cannot
# redirect attestation to another project or plan (#261, #237). Root
# mode clears both instead: the attester only falls back to the legacy
# ./task_plan.md when no selector is set, and a bound pin would make it
# refuse the root plan. Run from the project root (CWD here) so both
# resolutions land.
_attest="${SCRIPT_DIR}/attest-plan.sh"
if [ -f "${_attest}" ] && [ -f "${_mode_plan}" ]; then
PLAN_ID="${PLAN_ID:-}" sh "${_attest}" >/dev/null 2>&1 || true
if [ "$SLUG_MODE" -eq 1 ]; then
PWF_PLAN_ROOT="$PWD" PLAN_ID="${PLAN_ID}" sh "${_attest}" >/dev/null 2>&1 || true
else
PWF_PLAN_ROOT="" PLAN_ID="" sh "${_attest}" >/dev/null 2>&1 || true
fi
fi
}
@@ -845,7 +845,10 @@ class Injector(object):
)
raise Bail()
if plan_id:
if slug_is_valid(plan_id) and is_dir(plan_prefix + ".planning/" + plan_id):
# A linked plan directory is never selectable (#270): the same
# `[ ! -L ]` the reference applies on every branch below.
if (slug_is_valid(plan_id) and is_dir(plan_prefix + ".planning/" + plan_id)
and not is_link(plan_prefix + ".planning/" + plan_id)):
resolved = plan_prefix + ".planning/" + plan_id
scope = "scoped"
explicit = True
@@ -864,7 +867,7 @@ class Injector(object):
active = b""
if active and slug_is_valid(active):
slug = active.decode("ascii")
if is_dir(plan_prefix + ".planning/" + slug):
if is_dir(plan_prefix + ".planning/" + slug) and not is_link(plan_prefix + ".planning/" + slug):
resolved = plan_prefix + ".planning/" + slug
scope = "scoped"
if not resolved and is_dir(plan_prefix + ".planning"):
@@ -880,6 +883,8 @@ class Injector(object):
candidate = plan_prefix + ".planning/" + name
if not is_dir(candidate):
continue
if is_link(candidate):
continue
if not slug_is_valid(name):
continue
if not is_file(candidate + "/task_plan.md"):
@@ -1327,7 +1332,12 @@ def plan_is_ambiguous(plan_root, project_root, plan_id=""):
except OSError:
names = []
for name in names:
if slug_is_valid(name) and is_file(plan_root + "/" + name + "/task_plan.md"):
candidate_dir = plan_root + "/" + name
# A linked plan directory is not selectable, so it never counts (#270):
# the reference tests `[ -L "$plan_candidate_dir" ]` before `-f`.
if is_link(candidate_dir):
continue
if slug_is_valid(name) and is_file(candidate_dir + "/task_plan.md"):
count += 1
if count > 1:
return True
@@ -1364,7 +1374,7 @@ def resolve_plan_dir(env=None):
if plan_id:
if slug_is_valid(plan_id):
candidate = fs_root + "/" + plan_id
if is_dir(candidate) and within(candidate):
if is_dir(candidate) and not is_link(candidate) and within(candidate):
return found(plan_id)
return ("", "")
@@ -1382,7 +1392,7 @@ def resolve_plan_dir(env=None):
if slug_is_valid(active):
slug = active.decode("ascii")
candidate = fs_root + "/" + slug
if is_dir(candidate) and within(candidate):
if is_dir(candidate) and not is_link(candidate) and within(candidate):
return found(slug)
if is_dir(fs_root):
@@ -1398,6 +1408,8 @@ def resolve_plan_dir(env=None):
continue
if name.startswith("."):
continue
if is_link(candidate):
continue
if not slug_is_valid(name):
continue
if not is_file(candidate + "/task_plan.md"):
@@ -263,8 +263,9 @@ if [ -z "${PLAN_ID:-}" ]; then
PLAN_COUNT=1
fi
for plan_candidate in "${PLAN_PREFIX}".planning/*/task_plan.md; do
[ -f "$plan_candidate" ] || continue
plan_candidate_dir="${plan_candidate%/task_plan.md}"
[ -L "$plan_candidate_dir" ] && continue
[ -f "$plan_candidate" ] || continue
slug_is_valid "${plan_candidate_dir##*/}" || continue
PLAN_COUNT=$((PLAN_COUNT + 1))
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
@@ -295,7 +296,9 @@ if [ -n "${PLAN_ID:-}" ]; then
# 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
# A linked plan directory is never selectable (#270): same `-L` rule as
# the counter above and as resolve-plan-dir.sh, on every branch below.
if slug_is_valid "$PLAN_ID" && [ -d "${PLAN_PREFIX}.planning/${PLAN_ID}" ] && [ ! -L "${PLAN_PREFIX}.planning/${PLAN_ID}" ]; then
RESOLVED="${PLAN_PREFIX}.planning/${PLAN_ID}"; SCOPE="scoped"; EXPLICIT=1
else
if [ "$CONTEXT" = "userprompt" ]; then
@@ -305,7 +308,7 @@ if [ -n "${PLAN_ID:-}" ]; then
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
if [ -n "$AP" ] && slug_is_valid "$AP" && [ -d "${PLAN_PREFIX}.planning/${AP}" ] && [ ! -L "${PLAN_PREFIX}.planning/${AP}" ]; then
RESOLVED="${PLAN_PREFIX}.planning/${AP}"; SCOPE="scoped"
fi
fi
@@ -314,6 +317,7 @@ if [ -z "$RESOLVED" ] && [ -d "${PLAN_PREFIX}.planning" ]; then
for d in "${PLAN_PREFIX}".planning/*/; do
d="${d%/}"; n="${d##*/}"
case "$n" in .*) continue;; esac
[ -L "$d" ] && continue
slug_is_valid "$n" || continue
[ -f "$d/task_plan.md" ] || continue
m=$(stat -c '%Y' "$d" 2>/dev/null || stat -f '%m' "$d" 2>/dev/null || date -r "$d" +%s 2>/dev/null || echo 0)
@@ -139,6 +139,23 @@ function Test-WithinRoot {
return $candNorm.StartsWith($rootNorm + [System.IO.Path]::DirectorySeparatorChar, [System.StringComparison]::OrdinalIgnoreCase)
}
# A linked plan directory (symlink or junction) is never selectable: not by
# PLAN_ID, not by the pointer, not by the newest scan, and it never counts
# (#270). This is `[ -L ]` of resolve-plan-dir.sh and is_link of the Python
# twin: LinkType names symlinks and junctions only. The ReparsePoint
# attribute alone would also match OneDrive Files On-Demand placeholders,
# which every synced directory carries and which are not links to sh.
function Test-LinkedDirectory {
param($PathOrItem)
if ($PathOrItem -is [string]) {
$item = Get-Item -LiteralPath $PathOrItem -Force -ErrorAction SilentlyContinue
} else {
$item = $PathOrItem
}
if (-not $item) { return $false }
return ([string]$item.LinkType) -in @('SymbolicLink', 'Junction')
}
$activeFile = Join-Path $PlanRoot ".active_plan"
# A set PLAN_ID is a BINDING, not a hint (issue #237). A selector that names
@@ -158,6 +175,9 @@ if (-not $env:PLAN_ID) {
}
if (Test-Path -LiteralPath $PlanRoot -PathType Container) {
foreach ($entry in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue)) {
# A linked plan directory (symlink, junction) is not selectable and
# never counts, matching `[ -L ]` in resolve-plan-dir.sh (#270).
if (Test-LinkedDirectory $entry) { continue }
if ((Test-ValidSlug $entry.Name) -and
(Test-Path -LiteralPath (Join-Path $entry.FullName "task_plan.md") -PathType Leaf)) {
$planCount++
@@ -175,7 +195,7 @@ if ($planCount -gt 1) { exit 0 }
if ($env:PLAN_ID) {
if (Test-ValidSlug $env:PLAN_ID) {
$candidate = Join-Path $PlanRoot $env:PLAN_ID
if ((Test-Path -LiteralPath $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
if ((Test-Path -LiteralPath $candidate -PathType Container) -and -not (Test-LinkedDirectory $candidate) -and (Test-WithinRoot $candidate)) {
Write-Output $candidate
exit 0
}
@@ -198,7 +218,7 @@ if ($activeItem) {
$planId = "$(Get-Content -LiteralPath $activeFile -Raw -ErrorAction SilentlyContinue)".Trim()
if ($planId -and (Test-ValidSlug $planId)) {
$candidate = Join-Path $PlanRoot $planId
if ((Test-Path -LiteralPath $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
if ((Test-Path -LiteralPath $candidate -PathType Container) -and -not (Test-LinkedDirectory $candidate) -and (Test-WithinRoot $candidate)) {
Write-Output $candidate
exit 0
}
@@ -211,6 +231,7 @@ if ($activeItem) {
if (Test-Path -LiteralPath $PlanRoot -PathType Container) {
$latest = Get-ChildItem -LiteralPath $PlanRoot -Directory |
Where-Object { -not $_.Name.StartsWith('.') } |
Where-Object { -not (Test-LinkedDirectory $_) } |
Where-Object { Test-ValidSlug $_.Name } |
Where-Object { Test-Path -LiteralPath (Join-Path $_.FullName "task_plan.md") -PathType Leaf } |
Where-Object { Test-WithinRoot $_.FullName } |
@@ -246,10 +246,16 @@ mtime_of() {
printf "0\n"
}
# A linked plan directory (symlink or junction; `-L` sees both under Git
# Bash) is never selectable: not by PLAN_ID, not by the pointer, not by the
# newest-mtime scan, and it never counts below (#270). Containment alone let
# a link that stays inside the root be selected while the counter skipped
# it, so one real plan plus a newer linked one became an mtime guess again.
resolve_from_env() {
plan_id="${PLAN_ID:-}"
slug_is_valid "${plan_id}" || return 1
candidate="${PLAN_ROOT}/${plan_id}"
[ -L "${candidate}" ] && return 1
if [ -d "${candidate}" ] && is_within_root "${candidate}"; then
printf "%s\n" "${candidate}"
return 0
@@ -268,6 +274,7 @@ resolve_from_active_file() {
esac
slug_is_valid "${plan_id}" || return 1
candidate="${PLAN_ROOT}/${plan_id}"
[ -L "${candidate}" ] && return 1
if [ -d "${candidate}" ] && is_within_root "${candidate}"; then
printf "%s\n" "${candidate}"
return 0
@@ -288,6 +295,7 @@ resolve_latest_dir() {
case "${name}" in
.*) continue ;;
esac
[ -L "${clean}" ] && continue
slug_is_valid "${name}" || continue
[ -f "${clean}/task_plan.md" ] || continue
is_within_root "${clean}" || continue
@@ -338,8 +346,9 @@ if [ -z "${PLAN_ID:-}" ]; then
PLAN_COUNT=1
fi
for plan_candidate in "${PLAN_ROOT}"/*/task_plan.md; do
[ -f "$plan_candidate" ] || continue
plan_candidate_dir="${plan_candidate%/task_plan.md}"
[ -L "$plan_candidate_dir" ] && continue
[ -f "$plan_candidate" ] || continue
slug_is_valid "${plan_candidate_dir##*/}" || continue
PLAN_COUNT=$((PLAN_COUNT + 1))
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
@@ -474,7 +474,7 @@ def _format_opencode_part(data: Dict[str, Any], session_id: str) -> Optional[Dic
tool = (data.get('tool') or '').lower()
state = data.get('state') or {}
input_ = state.get('input') if isinstance(state, dict) else None
input_ = input_ or {}
input_ = input_ if isinstance(input_, dict) else {}
outcome = _opencode_state_annotation(state)
if tool in ('write', 'edit'):
fp = input_.get('filePath', '')
@@ -577,6 +577,7 @@ def opencode_catchup(project_path: str, mode: str = 'no-history') -> None:
"""
SELECT time_created, data FROM part
WHERE session_id = ?
AND json_valid(data)
AND json_extract(data, '$.type') = 'tool'
AND lower(json_extract(data, '$.tool')) IN ('write', 'edit', 'patch')
AND (
@@ -204,6 +204,8 @@ function Show-PlanList {
Write-Output "[active] marks the shared .active_plan pointer; listing does not bind this session."
$found = $false
foreach ($plan in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue | Sort-Object Name)) {
# A linked plan directory is never a plan (#270): no resolver selects it.
if (([string]$plan.LinkType) -in @('SymbolicLink', 'Junction')) { continue }
if (-not (Test-ValidSlug $plan.Name) -or -not (Test-WithinRoot $plan.FullName)) { continue }
$planFile = Join-Path $plan.FullName "task_plan.md"
if (-not (Test-Path -LiteralPath $planFile -PathType Leaf) -or -not (Test-WithinRoot $planFile)) { continue }
@@ -281,6 +283,11 @@ if (-not (Test-Path -LiteralPath $PlanDir -PathType Container)) {
Write-Error "Run: init-session.sh `"$PlanId`" to create it, or check .planning\ for available plans."
exit 1
}
$planDirItem = Get-Item -LiteralPath $PlanDir -Force -ErrorAction SilentlyContinue
if ($planDirItem -and (([string]$planDirItem.LinkType) -in @('SymbolicLink', 'Junction'))) {
Write-Error "Error: plan directory is a symlink or junction and no route selects it: $PlanDir"
exit 1
}
if (-not (Test-WithinRoot $PlanRoot) -or -not (Test-WithinRoot $PlanDir)) {
Write-Error "Error: plan directory must remain within the project."
exit 1
@@ -272,6 +272,9 @@ list_plans() {
printf '%s\n' 'Available plans:'
for _dir in "${PLAN_ROOT}"/*; do
[ -d "${_dir}" ] || continue
# A linked plan directory is never a plan (#270): no resolver selects
# it, so listing it would advertise a PLAN_ID every route refuses.
[ -L "${_dir}" ] && continue
_id="${_dir##*/}"
slug_is_valid "${_id}" || continue
is_within_root "${_dir}" || continue
@@ -312,7 +315,7 @@ if [ "${1:-}" = '' ]; then
exit 1
fi
plan_id="$(current_active)"
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ] && is_within_root "${PLAN_ROOT}/${plan_id}"; then
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ] && [ ! -L "${PLAN_ROOT}/${plan_id}" ] && is_within_root "${PLAN_ROOT}/${plan_id}"; then
printf '%s\n' "Active plan: ${plan_id}" "Path: ${PLAN_ROOT}/${plan_id}"
elif [ -n "${plan_id}" ]; then
printf '%s\n' "Active plan pointer: ${plan_id} (directory not found or outside project - stale pointer)"
@@ -333,6 +336,10 @@ if [ ! -d "${PLAN_DIR}" ]; then
"Run: init-session.sh \"${PLAN_ID}\" to create it, or use --list to see available plans." >&2
exit 1
fi
if [ -L "${PLAN_DIR}" ]; then
printf '%s\n' "Error: plan directory is a symlink or junction and no route selects it: ${PLAN_DIR}" >&2
exit 1
fi
if ! is_within_root "${PLAN_ROOT}" || ! is_within_root "${PLAN_DIR}"; then
printf '%s\n' 'Error: plan directory is outside the project or cannot be verified.' >&2
exit 1
@@ -350,16 +350,23 @@ if ($Mode -ne "") {
# (c) auto-attest (attestation default-on in v3 modes, security strand rec 1).
# attest-plan.ps1 intentionally refuses non-Windows hosts because its secure
# no-follow implementation uses Win32 handles. On Unix, use the POSIX
# attester instead. Bind slug mode to the plan we just created so an
# inherited PLAN_ID cannot redirect attestation to another plan.
# attester instead. Slug mode binds PWF_PLAN_ROOT and PLAN_ID to the plan
# we just created so an inherited pin or slug cannot redirect attestation
# to another project or plan (#261, #237). Root mode clears both instead:
# the attester only falls back to the legacy ./task_plan.md when no
# selector is set, and a bound pin would make it refuse the root plan.
$PlanFilePwf = Join-Path $PlanDirPwf "task_plan.md"
if (Test-Path -LiteralPath $PlanFilePwf) {
$HadPlanId = Test-Path Env:PLAN_ID
$PreviousPlanId = $env:PLAN_ID
$HadPlanRoot = Test-Path Env:PWF_PLAN_ROOT
$PreviousPlanRoot = $env:PWF_PLAN_ROOT
try {
if ($UsePlanDir) {
$env:PWF_PLAN_ROOT = (Get-Location).Path
$env:PLAN_ID = $PlanId
} else {
Remove-Item Env:PWF_PLAN_ROOT -ErrorAction SilentlyContinue
Remove-Item Env:PLAN_ID -ErrorAction SilentlyContinue
}
@@ -384,6 +391,11 @@ if ($Mode -ne "") {
} else {
Remove-Item Env:PLAN_ID -ErrorAction SilentlyContinue
}
if ($HadPlanRoot) {
$env:PWF_PLAN_ROOT = $PreviousPlanRoot
} else {
Remove-Item Env:PWF_PLAN_ROOT -ErrorAction SilentlyContinue
}
}
}
@@ -103,6 +103,7 @@ slugify() {
# Lowercase, non-alphanumerics → '-', collapse repeats, trim leading/trailing '-'
printf '%s' "$1" \
| tr '[:upper:]' '[:lower:]' \
| tr '\r\n' '--' \
| sed -e 's/[^a-z0-9]/-/g' -e 's/-\{2,\}/-/g' -e 's/^-//' -e 's/-$//' \
| cut -c1-40
}
@@ -202,12 +203,20 @@ apply_v3_mode() {
# (c) auto-attest the plan (attestation default-on in v3 modes, security
# strand rec 1). attest-plan.sh resolves the same way init-session just
# pinned things: in slug mode PLAN_ID points at this plan dir; in legacy
# mode it is empty and the script falls back to ./task_plan.md at root.
# Run from the project root (CWD here) so both resolutions land.
# pinned things. Slug mode binds both selectors to the plan that was
# just created, so an inherited PWF_PLAN_ROOT or PLAN_ID cannot
# redirect attestation to another project or plan (#261, #237). Root
# mode clears both instead: the attester only falls back to the legacy
# ./task_plan.md when no selector is set, and a bound pin would make it
# refuse the root plan. Run from the project root (CWD here) so both
# resolutions land.
_attest="${SCRIPT_DIR}/attest-plan.sh"
if [ -f "${_attest}" ] && [ -f "${_mode_plan}" ]; then
PLAN_ID="${PLAN_ID:-}" sh "${_attest}" >/dev/null 2>&1 || true
if [ "$SLUG_MODE" -eq 1 ]; then
PWF_PLAN_ROOT="$PWD" PLAN_ID="${PLAN_ID}" sh "${_attest}" >/dev/null 2>&1 || true
else
PWF_PLAN_ROOT="" PLAN_ID="" sh "${_attest}" >/dev/null 2>&1 || true
fi
fi
}
@@ -139,6 +139,23 @@ function Test-WithinRoot {
return $candNorm.StartsWith($rootNorm + [System.IO.Path]::DirectorySeparatorChar, [System.StringComparison]::OrdinalIgnoreCase)
}
# A linked plan directory (symlink or junction) is never selectable: not by
# PLAN_ID, not by the pointer, not by the newest scan, and it never counts
# (#270). This is `[ -L ]` of resolve-plan-dir.sh and is_link of the Python
# twin: LinkType names symlinks and junctions only. The ReparsePoint
# attribute alone would also match OneDrive Files On-Demand placeholders,
# which every synced directory carries and which are not links to sh.
function Test-LinkedDirectory {
param($PathOrItem)
if ($PathOrItem -is [string]) {
$item = Get-Item -LiteralPath $PathOrItem -Force -ErrorAction SilentlyContinue
} else {
$item = $PathOrItem
}
if (-not $item) { return $false }
return ([string]$item.LinkType) -in @('SymbolicLink', 'Junction')
}
$activeFile = Join-Path $PlanRoot ".active_plan"
# A set PLAN_ID is a BINDING, not a hint (issue #237). A selector that names
@@ -158,6 +175,9 @@ if (-not $env:PLAN_ID) {
}
if (Test-Path -LiteralPath $PlanRoot -PathType Container) {
foreach ($entry in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue)) {
# A linked plan directory (symlink, junction) is not selectable and
# never counts, matching `[ -L ]` in resolve-plan-dir.sh (#270).
if (Test-LinkedDirectory $entry) { continue }
if ((Test-ValidSlug $entry.Name) -and
(Test-Path -LiteralPath (Join-Path $entry.FullName "task_plan.md") -PathType Leaf)) {
$planCount++
@@ -175,7 +195,7 @@ if ($planCount -gt 1) { exit 0 }
if ($env:PLAN_ID) {
if (Test-ValidSlug $env:PLAN_ID) {
$candidate = Join-Path $PlanRoot $env:PLAN_ID
if ((Test-Path -LiteralPath $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
if ((Test-Path -LiteralPath $candidate -PathType Container) -and -not (Test-LinkedDirectory $candidate) -and (Test-WithinRoot $candidate)) {
Write-Output $candidate
exit 0
}
@@ -198,7 +218,7 @@ if ($activeItem) {
$planId = "$(Get-Content -LiteralPath $activeFile -Raw -ErrorAction SilentlyContinue)".Trim()
if ($planId -and (Test-ValidSlug $planId)) {
$candidate = Join-Path $PlanRoot $planId
if ((Test-Path -LiteralPath $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
if ((Test-Path -LiteralPath $candidate -PathType Container) -and -not (Test-LinkedDirectory $candidate) -and (Test-WithinRoot $candidate)) {
Write-Output $candidate
exit 0
}
@@ -211,6 +231,7 @@ if ($activeItem) {
if (Test-Path -LiteralPath $PlanRoot -PathType Container) {
$latest = Get-ChildItem -LiteralPath $PlanRoot -Directory |
Where-Object { -not $_.Name.StartsWith('.') } |
Where-Object { -not (Test-LinkedDirectory $_) } |
Where-Object { Test-ValidSlug $_.Name } |
Where-Object { Test-Path -LiteralPath (Join-Path $_.FullName "task_plan.md") -PathType Leaf } |
Where-Object { Test-WithinRoot $_.FullName } |
@@ -246,10 +246,16 @@ mtime_of() {
printf "0\n"
}
# A linked plan directory (symlink or junction; `-L` sees both under Git
# Bash) is never selectable: not by PLAN_ID, not by the pointer, not by the
# newest-mtime scan, and it never counts below (#270). Containment alone let
# a link that stays inside the root be selected while the counter skipped
# it, so one real plan plus a newer linked one became an mtime guess again.
resolve_from_env() {
plan_id="${PLAN_ID:-}"
slug_is_valid "${plan_id}" || return 1
candidate="${PLAN_ROOT}/${plan_id}"
[ -L "${candidate}" ] && return 1
if [ -d "${candidate}" ] && is_within_root "${candidate}"; then
printf "%s\n" "${candidate}"
return 0
@@ -268,6 +274,7 @@ resolve_from_active_file() {
esac
slug_is_valid "${plan_id}" || return 1
candidate="${PLAN_ROOT}/${plan_id}"
[ -L "${candidate}" ] && return 1
if [ -d "${candidate}" ] && is_within_root "${candidate}"; then
printf "%s\n" "${candidate}"
return 0
@@ -288,6 +295,7 @@ resolve_latest_dir() {
case "${name}" in
.*) continue ;;
esac
[ -L "${clean}" ] && continue
slug_is_valid "${name}" || continue
[ -f "${clean}/task_plan.md" ] || continue
is_within_root "${clean}" || continue
@@ -338,8 +346,9 @@ if [ -z "${PLAN_ID:-}" ]; then
PLAN_COUNT=1
fi
for plan_candidate in "${PLAN_ROOT}"/*/task_plan.md; do
[ -f "$plan_candidate" ] || continue
plan_candidate_dir="${plan_candidate%/task_plan.md}"
[ -L "$plan_candidate_dir" ] && continue
[ -f "$plan_candidate" ] || continue
slug_is_valid "${plan_candidate_dir##*/}" || continue
PLAN_COUNT=$((PLAN_COUNT + 1))
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
@@ -474,7 +474,7 @@ def _format_opencode_part(data: Dict[str, Any], session_id: str) -> Optional[Dic
tool = (data.get('tool') or '').lower()
state = data.get('state') or {}
input_ = state.get('input') if isinstance(state, dict) else None
input_ = input_ or {}
input_ = input_ if isinstance(input_, dict) else {}
outcome = _opencode_state_annotation(state)
if tool in ('write', 'edit'):
fp = input_.get('filePath', '')
@@ -577,6 +577,7 @@ def opencode_catchup(project_path: str, mode: str = 'no-history') -> None:
"""
SELECT time_created, data FROM part
WHERE session_id = ?
AND json_valid(data)
AND json_extract(data, '$.type') = 'tool'
AND lower(json_extract(data, '$.tool')) IN ('write', 'edit', 'patch')
AND (
@@ -204,6 +204,8 @@ function Show-PlanList {
Write-Output "[active] marks the shared .active_plan pointer; listing does not bind this session."
$found = $false
foreach ($plan in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue | Sort-Object Name)) {
# A linked plan directory is never a plan (#270): no resolver selects it.
if (([string]$plan.LinkType) -in @('SymbolicLink', 'Junction')) { continue }
if (-not (Test-ValidSlug $plan.Name) -or -not (Test-WithinRoot $plan.FullName)) { continue }
$planFile = Join-Path $plan.FullName "task_plan.md"
if (-not (Test-Path -LiteralPath $planFile -PathType Leaf) -or -not (Test-WithinRoot $planFile)) { continue }
@@ -281,6 +283,11 @@ if (-not (Test-Path -LiteralPath $PlanDir -PathType Container)) {
Write-Error "Run: init-session.sh `"$PlanId`" to create it, or check .planning\ for available plans."
exit 1
}
$planDirItem = Get-Item -LiteralPath $PlanDir -Force -ErrorAction SilentlyContinue
if ($planDirItem -and (([string]$planDirItem.LinkType) -in @('SymbolicLink', 'Junction'))) {
Write-Error "Error: plan directory is a symlink or junction and no route selects it: $PlanDir"
exit 1
}
if (-not (Test-WithinRoot $PlanRoot) -or -not (Test-WithinRoot $PlanDir)) {
Write-Error "Error: plan directory must remain within the project."
exit 1
@@ -272,6 +272,9 @@ list_plans() {
printf '%s\n' 'Available plans:'
for _dir in "${PLAN_ROOT}"/*; do
[ -d "${_dir}" ] || continue
# A linked plan directory is never a plan (#270): no resolver selects
# it, so listing it would advertise a PLAN_ID every route refuses.
[ -L "${_dir}" ] && continue
_id="${_dir##*/}"
slug_is_valid "${_id}" || continue
is_within_root "${_dir}" || continue
@@ -312,7 +315,7 @@ if [ "${1:-}" = '' ]; then
exit 1
fi
plan_id="$(current_active)"
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ] && is_within_root "${PLAN_ROOT}/${plan_id}"; then
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ] && [ ! -L "${PLAN_ROOT}/${plan_id}" ] && is_within_root "${PLAN_ROOT}/${plan_id}"; then
printf '%s\n' "Active plan: ${plan_id}" "Path: ${PLAN_ROOT}/${plan_id}"
elif [ -n "${plan_id}" ]; then
printf '%s\n' "Active plan pointer: ${plan_id} (directory not found or outside project - stale pointer)"
@@ -333,6 +336,10 @@ if [ ! -d "${PLAN_DIR}" ]; then
"Run: init-session.sh \"${PLAN_ID}\" to create it, or use --list to see available plans." >&2
exit 1
fi
if [ -L "${PLAN_DIR}" ]; then
printf '%s\n' "Error: plan directory is a symlink or junction and no route selects it: ${PLAN_DIR}" >&2
exit 1
fi
if ! is_within_root "${PLAN_ROOT}" || ! is_within_root "${PLAN_DIR}"; then
printf '%s\n' 'Error: plan directory is outside the project or cannot be verified.' >&2
exit 1
+1 -1
View File
@@ -36,7 +36,7 @@ hooks:
- type: command
command: "SH=\"\"; for c in \"${PWF_SCRIPT_DIR}/skill-hook.sh\" \"${CLAUDE_SKILL_DIR}/scripts/skill-hook.sh\" \"$HOME/.cursor/skills/planning-with-files/scripts/skill-hook.sh\" \"$HOME/.claude/skills/planning-with-files/scripts/skill-hook.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/skill-hook.sh\"; do [ -f \"$c\" ] && { SH=\"$c\"; break; }; done; [ -n \"$SH\" ] && sh \"$SH\" --event=precompact; exit 0"
metadata:
version: "3.20.0"
version: "3.20.3"
---
@@ -350,16 +350,23 @@ if ($Mode -ne "") {
# (c) auto-attest (attestation default-on in v3 modes, security strand rec 1).
# attest-plan.ps1 intentionally refuses non-Windows hosts because its secure
# no-follow implementation uses Win32 handles. On Unix, use the POSIX
# attester instead. Bind slug mode to the plan we just created so an
# inherited PLAN_ID cannot redirect attestation to another plan.
# attester instead. Slug mode binds PWF_PLAN_ROOT and PLAN_ID to the plan
# we just created so an inherited pin or slug cannot redirect attestation
# to another project or plan (#261, #237). Root mode clears both instead:
# the attester only falls back to the legacy ./task_plan.md when no
# selector is set, and a bound pin would make it refuse the root plan.
$PlanFilePwf = Join-Path $PlanDirPwf "task_plan.md"
if (Test-Path -LiteralPath $PlanFilePwf) {
$HadPlanId = Test-Path Env:PLAN_ID
$PreviousPlanId = $env:PLAN_ID
$HadPlanRoot = Test-Path Env:PWF_PLAN_ROOT
$PreviousPlanRoot = $env:PWF_PLAN_ROOT
try {
if ($UsePlanDir) {
$env:PWF_PLAN_ROOT = (Get-Location).Path
$env:PLAN_ID = $PlanId
} else {
Remove-Item Env:PWF_PLAN_ROOT -ErrorAction SilentlyContinue
Remove-Item Env:PLAN_ID -ErrorAction SilentlyContinue
}
@@ -384,6 +391,11 @@ if ($Mode -ne "") {
} else {
Remove-Item Env:PLAN_ID -ErrorAction SilentlyContinue
}
if ($HadPlanRoot) {
$env:PWF_PLAN_ROOT = $PreviousPlanRoot
} else {
Remove-Item Env:PWF_PLAN_ROOT -ErrorAction SilentlyContinue
}
}
}
@@ -103,6 +103,7 @@ slugify() {
# Lowercase, non-alphanumerics → '-', collapse repeats, trim leading/trailing '-'
printf '%s' "$1" \
| tr '[:upper:]' '[:lower:]' \
| tr '\r\n' '--' \
| sed -e 's/[^a-z0-9]/-/g' -e 's/-\{2,\}/-/g' -e 's/^-//' -e 's/-$//' \
| cut -c1-40
}
@@ -202,12 +203,20 @@ apply_v3_mode() {
# (c) auto-attest the plan (attestation default-on in v3 modes, security
# strand rec 1). attest-plan.sh resolves the same way init-session just
# pinned things: in slug mode PLAN_ID points at this plan dir; in legacy
# mode it is empty and the script falls back to ./task_plan.md at root.
# Run from the project root (CWD here) so both resolutions land.
# pinned things. Slug mode binds both selectors to the plan that was
# just created, so an inherited PWF_PLAN_ROOT or PLAN_ID cannot
# redirect attestation to another project or plan (#261, #237). Root
# mode clears both instead: the attester only falls back to the legacy
# ./task_plan.md when no selector is set, and a bound pin would make it
# refuse the root plan. Run from the project root (CWD here) so both
# resolutions land.
_attest="${SCRIPT_DIR}/attest-plan.sh"
if [ -f "${_attest}" ] && [ -f "${_mode_plan}" ]; then
PLAN_ID="${PLAN_ID:-}" sh "${_attest}" >/dev/null 2>&1 || true
if [ "$SLUG_MODE" -eq 1 ]; then
PWF_PLAN_ROOT="$PWD" PLAN_ID="${PLAN_ID}" sh "${_attest}" >/dev/null 2>&1 || true
else
PWF_PLAN_ROOT="" PLAN_ID="" sh "${_attest}" >/dev/null 2>&1 || true
fi
fi
}
@@ -845,7 +845,10 @@ class Injector(object):
)
raise Bail()
if plan_id:
if slug_is_valid(plan_id) and is_dir(plan_prefix + ".planning/" + plan_id):
# A linked plan directory is never selectable (#270): the same
# `[ ! -L ]` the reference applies on every branch below.
if (slug_is_valid(plan_id) and is_dir(plan_prefix + ".planning/" + plan_id)
and not is_link(plan_prefix + ".planning/" + plan_id)):
resolved = plan_prefix + ".planning/" + plan_id
scope = "scoped"
explicit = True
@@ -864,7 +867,7 @@ class Injector(object):
active = b""
if active and slug_is_valid(active):
slug = active.decode("ascii")
if is_dir(plan_prefix + ".planning/" + slug):
if is_dir(plan_prefix + ".planning/" + slug) and not is_link(plan_prefix + ".planning/" + slug):
resolved = plan_prefix + ".planning/" + slug
scope = "scoped"
if not resolved and is_dir(plan_prefix + ".planning"):
@@ -880,6 +883,8 @@ class Injector(object):
candidate = plan_prefix + ".planning/" + name
if not is_dir(candidate):
continue
if is_link(candidate):
continue
if not slug_is_valid(name):
continue
if not is_file(candidate + "/task_plan.md"):
@@ -1327,7 +1332,12 @@ def plan_is_ambiguous(plan_root, project_root, plan_id=""):
except OSError:
names = []
for name in names:
if slug_is_valid(name) and is_file(plan_root + "/" + name + "/task_plan.md"):
candidate_dir = plan_root + "/" + name
# A linked plan directory is not selectable, so it never counts (#270):
# the reference tests `[ -L "$plan_candidate_dir" ]` before `-f`.
if is_link(candidate_dir):
continue
if slug_is_valid(name) and is_file(candidate_dir + "/task_plan.md"):
count += 1
if count > 1:
return True
@@ -1364,7 +1374,7 @@ def resolve_plan_dir(env=None):
if plan_id:
if slug_is_valid(plan_id):
candidate = fs_root + "/" + plan_id
if is_dir(candidate) and within(candidate):
if is_dir(candidate) and not is_link(candidate) and within(candidate):
return found(plan_id)
return ("", "")
@@ -1382,7 +1392,7 @@ def resolve_plan_dir(env=None):
if slug_is_valid(active):
slug = active.decode("ascii")
candidate = fs_root + "/" + slug
if is_dir(candidate) and within(candidate):
if is_dir(candidate) and not is_link(candidate) and within(candidate):
return found(slug)
if is_dir(fs_root):
@@ -1398,6 +1408,8 @@ def resolve_plan_dir(env=None):
continue
if name.startswith("."):
continue
if is_link(candidate):
continue
if not slug_is_valid(name):
continue
if not is_file(candidate + "/task_plan.md"):
@@ -263,8 +263,9 @@ if [ -z "${PLAN_ID:-}" ]; then
PLAN_COUNT=1
fi
for plan_candidate in "${PLAN_PREFIX}".planning/*/task_plan.md; do
[ -f "$plan_candidate" ] || continue
plan_candidate_dir="${plan_candidate%/task_plan.md}"
[ -L "$plan_candidate_dir" ] && continue
[ -f "$plan_candidate" ] || continue
slug_is_valid "${plan_candidate_dir##*/}" || continue
PLAN_COUNT=$((PLAN_COUNT + 1))
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
@@ -295,7 +296,9 @@ if [ -n "${PLAN_ID:-}" ]; then
# 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
# A linked plan directory is never selectable (#270): same `-L` rule as
# the counter above and as resolve-plan-dir.sh, on every branch below.
if slug_is_valid "$PLAN_ID" && [ -d "${PLAN_PREFIX}.planning/${PLAN_ID}" ] && [ ! -L "${PLAN_PREFIX}.planning/${PLAN_ID}" ]; then
RESOLVED="${PLAN_PREFIX}.planning/${PLAN_ID}"; SCOPE="scoped"; EXPLICIT=1
else
if [ "$CONTEXT" = "userprompt" ]; then
@@ -305,7 +308,7 @@ if [ -n "${PLAN_ID:-}" ]; then
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
if [ -n "$AP" ] && slug_is_valid "$AP" && [ -d "${PLAN_PREFIX}.planning/${AP}" ] && [ ! -L "${PLAN_PREFIX}.planning/${AP}" ]; then
RESOLVED="${PLAN_PREFIX}.planning/${AP}"; SCOPE="scoped"
fi
fi
@@ -314,6 +317,7 @@ if [ -z "$RESOLVED" ] && [ -d "${PLAN_PREFIX}.planning" ]; then
for d in "${PLAN_PREFIX}".planning/*/; do
d="${d%/}"; n="${d##*/}"
case "$n" in .*) continue;; esac
[ -L "$d" ] && continue
slug_is_valid "$n" || continue
[ -f "$d/task_plan.md" ] || continue
m=$(stat -c '%Y' "$d" 2>/dev/null || stat -f '%m' "$d" 2>/dev/null || date -r "$d" +%s 2>/dev/null || echo 0)
@@ -139,6 +139,23 @@ function Test-WithinRoot {
return $candNorm.StartsWith($rootNorm + [System.IO.Path]::DirectorySeparatorChar, [System.StringComparison]::OrdinalIgnoreCase)
}
# A linked plan directory (symlink or junction) is never selectable: not by
# PLAN_ID, not by the pointer, not by the newest scan, and it never counts
# (#270). This is `[ -L ]` of resolve-plan-dir.sh and is_link of the Python
# twin: LinkType names symlinks and junctions only. The ReparsePoint
# attribute alone would also match OneDrive Files On-Demand placeholders,
# which every synced directory carries and which are not links to sh.
function Test-LinkedDirectory {
param($PathOrItem)
if ($PathOrItem -is [string]) {
$item = Get-Item -LiteralPath $PathOrItem -Force -ErrorAction SilentlyContinue
} else {
$item = $PathOrItem
}
if (-not $item) { return $false }
return ([string]$item.LinkType) -in @('SymbolicLink', 'Junction')
}
$activeFile = Join-Path $PlanRoot ".active_plan"
# A set PLAN_ID is a BINDING, not a hint (issue #237). A selector that names
@@ -158,6 +175,9 @@ if (-not $env:PLAN_ID) {
}
if (Test-Path -LiteralPath $PlanRoot -PathType Container) {
foreach ($entry in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue)) {
# A linked plan directory (symlink, junction) is not selectable and
# never counts, matching `[ -L ]` in resolve-plan-dir.sh (#270).
if (Test-LinkedDirectory $entry) { continue }
if ((Test-ValidSlug $entry.Name) -and
(Test-Path -LiteralPath (Join-Path $entry.FullName "task_plan.md") -PathType Leaf)) {
$planCount++
@@ -175,7 +195,7 @@ if ($planCount -gt 1) { exit 0 }
if ($env:PLAN_ID) {
if (Test-ValidSlug $env:PLAN_ID) {
$candidate = Join-Path $PlanRoot $env:PLAN_ID
if ((Test-Path -LiteralPath $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
if ((Test-Path -LiteralPath $candidate -PathType Container) -and -not (Test-LinkedDirectory $candidate) -and (Test-WithinRoot $candidate)) {
Write-Output $candidate
exit 0
}
@@ -198,7 +218,7 @@ if ($activeItem) {
$planId = "$(Get-Content -LiteralPath $activeFile -Raw -ErrorAction SilentlyContinue)".Trim()
if ($planId -and (Test-ValidSlug $planId)) {
$candidate = Join-Path $PlanRoot $planId
if ((Test-Path -LiteralPath $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
if ((Test-Path -LiteralPath $candidate -PathType Container) -and -not (Test-LinkedDirectory $candidate) -and (Test-WithinRoot $candidate)) {
Write-Output $candidate
exit 0
}
@@ -211,6 +231,7 @@ if ($activeItem) {
if (Test-Path -LiteralPath $PlanRoot -PathType Container) {
$latest = Get-ChildItem -LiteralPath $PlanRoot -Directory |
Where-Object { -not $_.Name.StartsWith('.') } |
Where-Object { -not (Test-LinkedDirectory $_) } |
Where-Object { Test-ValidSlug $_.Name } |
Where-Object { Test-Path -LiteralPath (Join-Path $_.FullName "task_plan.md") -PathType Leaf } |
Where-Object { Test-WithinRoot $_.FullName } |
@@ -246,10 +246,16 @@ mtime_of() {
printf "0\n"
}
# A linked plan directory (symlink or junction; `-L` sees both under Git
# Bash) is never selectable: not by PLAN_ID, not by the pointer, not by the
# newest-mtime scan, and it never counts below (#270). Containment alone let
# a link that stays inside the root be selected while the counter skipped
# it, so one real plan plus a newer linked one became an mtime guess again.
resolve_from_env() {
plan_id="${PLAN_ID:-}"
slug_is_valid "${plan_id}" || return 1
candidate="${PLAN_ROOT}/${plan_id}"
[ -L "${candidate}" ] && return 1
if [ -d "${candidate}" ] && is_within_root "${candidate}"; then
printf "%s\n" "${candidate}"
return 0
@@ -268,6 +274,7 @@ resolve_from_active_file() {
esac
slug_is_valid "${plan_id}" || return 1
candidate="${PLAN_ROOT}/${plan_id}"
[ -L "${candidate}" ] && return 1
if [ -d "${candidate}" ] && is_within_root "${candidate}"; then
printf "%s\n" "${candidate}"
return 0
@@ -288,6 +295,7 @@ resolve_latest_dir() {
case "${name}" in
.*) continue ;;
esac
[ -L "${clean}" ] && continue
slug_is_valid "${name}" || continue
[ -f "${clean}/task_plan.md" ] || continue
is_within_root "${clean}" || continue
@@ -338,8 +346,9 @@ if [ -z "${PLAN_ID:-}" ]; then
PLAN_COUNT=1
fi
for plan_candidate in "${PLAN_ROOT}"/*/task_plan.md; do
[ -f "$plan_candidate" ] || continue
plan_candidate_dir="${plan_candidate%/task_plan.md}"
[ -L "$plan_candidate_dir" ] && continue
[ -f "$plan_candidate" ] || continue
slug_is_valid "${plan_candidate_dir##*/}" || continue
PLAN_COUNT=$((PLAN_COUNT + 1))
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
@@ -474,7 +474,7 @@ def _format_opencode_part(data: Dict[str, Any], session_id: str) -> Optional[Dic
tool = (data.get('tool') or '').lower()
state = data.get('state') or {}
input_ = state.get('input') if isinstance(state, dict) else None
input_ = input_ or {}
input_ = input_ if isinstance(input_, dict) else {}
outcome = _opencode_state_annotation(state)
if tool in ('write', 'edit'):
fp = input_.get('filePath', '')
@@ -577,6 +577,7 @@ def opencode_catchup(project_path: str, mode: str = 'no-history') -> None:
"""
SELECT time_created, data FROM part
WHERE session_id = ?
AND json_valid(data)
AND json_extract(data, '$.type') = 'tool'
AND lower(json_extract(data, '$.tool')) IN ('write', 'edit', 'patch')
AND (
@@ -204,6 +204,8 @@ function Show-PlanList {
Write-Output "[active] marks the shared .active_plan pointer; listing does not bind this session."
$found = $false
foreach ($plan in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue | Sort-Object Name)) {
# A linked plan directory is never a plan (#270): no resolver selects it.
if (([string]$plan.LinkType) -in @('SymbolicLink', 'Junction')) { continue }
if (-not (Test-ValidSlug $plan.Name) -or -not (Test-WithinRoot $plan.FullName)) { continue }
$planFile = Join-Path $plan.FullName "task_plan.md"
if (-not (Test-Path -LiteralPath $planFile -PathType Leaf) -or -not (Test-WithinRoot $planFile)) { continue }
@@ -281,6 +283,11 @@ if (-not (Test-Path -LiteralPath $PlanDir -PathType Container)) {
Write-Error "Run: init-session.sh `"$PlanId`" to create it, or check .planning\ for available plans."
exit 1
}
$planDirItem = Get-Item -LiteralPath $PlanDir -Force -ErrorAction SilentlyContinue
if ($planDirItem -and (([string]$planDirItem.LinkType) -in @('SymbolicLink', 'Junction'))) {
Write-Error "Error: plan directory is a symlink or junction and no route selects it: $PlanDir"
exit 1
}
if (-not (Test-WithinRoot $PlanRoot) -or -not (Test-WithinRoot $PlanDir)) {
Write-Error "Error: plan directory must remain within the project."
exit 1
@@ -272,6 +272,9 @@ list_plans() {
printf '%s\n' 'Available plans:'
for _dir in "${PLAN_ROOT}"/*; do
[ -d "${_dir}" ] || continue
# A linked plan directory is never a plan (#270): no resolver selects
# it, so listing it would advertise a PLAN_ID every route refuses.
[ -L "${_dir}" ] && continue
_id="${_dir##*/}"
slug_is_valid "${_id}" || continue
is_within_root "${_dir}" || continue
@@ -312,7 +315,7 @@ if [ "${1:-}" = '' ]; then
exit 1
fi
plan_id="$(current_active)"
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ] && is_within_root "${PLAN_ROOT}/${plan_id}"; then
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ] && [ ! -L "${PLAN_ROOT}/${plan_id}" ] && is_within_root "${PLAN_ROOT}/${plan_id}"; then
printf '%s\n' "Active plan: ${plan_id}" "Path: ${PLAN_ROOT}/${plan_id}"
elif [ -n "${plan_id}" ]; then
printf '%s\n' "Active plan pointer: ${plan_id} (directory not found or outside project - stale pointer)"
@@ -333,6 +336,10 @@ if [ ! -d "${PLAN_DIR}" ]; then
"Run: init-session.sh \"${PLAN_ID}\" to create it, or use --list to see available plans." >&2
exit 1
fi
if [ -L "${PLAN_DIR}" ]; then
printf '%s\n' "Error: plan directory is a symlink or junction and no route selects it: ${PLAN_DIR}" >&2
exit 1
fi
if ! is_within_root "${PLAN_ROOT}" || ! is_within_root "${PLAN_DIR}"; then
printf '%s\n' 'Error: plan directory is outside the project or cannot be verified.' >&2
exit 1
@@ -188,8 +188,14 @@ describe("resolver", () => {
fs.writeFileSync(path.join(planning, ".active_plan"), "2026-09-02-evil\n")
expect(resolvePlan(root, {}, env).planDir).toBeNull()
expect(resolvePlan(root, {}, { ...env, PLAN_ID: "2026-09-02-evil" }).planDir).toBeNull()
// a linked plan directory never counts toward the several-plans rule (#270)
expect(countSelectablePlans(root)).toBe(0)
const real = path.join(planning, "2026-09-02-real")
fs.mkdirSync(real)
fs.writeFileSync(path.join(real, "task_plan.md"), "# REAL\n")
expect(countSelectablePlans(root)).toBe(1)
expect(resolvePlan(root, {}, env).planDir).toBe(real)
fs.rmSync(path.join(real, "task_plan.md"))
try {
fs.symlinkSync(path.join(outside, "task_plan.md"), path.join(real, "task_plan.md"), "file")
} catch {
@@ -205,6 +205,9 @@ export function countSelectablePlans(root: string): number {
}
for (const entry of entries) {
if (!slugIsValid(entry)) continue
// A linked plan directory is not selectable and never counts (#270),
// matching the shell counters, the Hermes plugin and resolvePlan below.
if (!isRealDir(path.join(planningRoot, entry))) continue
if (!isRegularFile(path.join(planningRoot, entry, "task_plan.md"))) continue
count += 1
if (count > 1) break
+1 -1
View File
@@ -36,7 +36,7 @@ hooks:
- type: command
command: "SH=\"\"; for c in \"${PWF_SCRIPT_DIR}/skill-hook.sh\" \"${CLAUDE_SKILL_DIR}/scripts/skill-hook.sh\" \"$HOME/.factory/skills/planning-with-files/scripts/skill-hook.sh\" \"$HOME/.claude/skills/planning-with-files/scripts/skill-hook.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/skill-hook.sh\"; do [ -f \"$c\" ] && { SH=\"$c\"; break; }; done; [ -n \"$SH\" ] && sh \"$SH\" --event=precompact; exit 0"
metadata:
version: "3.20.0"
version: "3.20.3"
---
# Planning with Files
@@ -350,16 +350,23 @@ if ($Mode -ne "") {
# (c) auto-attest (attestation default-on in v3 modes, security strand rec 1).
# attest-plan.ps1 intentionally refuses non-Windows hosts because its secure
# no-follow implementation uses Win32 handles. On Unix, use the POSIX
# attester instead. Bind slug mode to the plan we just created so an
# inherited PLAN_ID cannot redirect attestation to another plan.
# attester instead. Slug mode binds PWF_PLAN_ROOT and PLAN_ID to the plan
# we just created so an inherited pin or slug cannot redirect attestation
# to another project or plan (#261, #237). Root mode clears both instead:
# the attester only falls back to the legacy ./task_plan.md when no
# selector is set, and a bound pin would make it refuse the root plan.
$PlanFilePwf = Join-Path $PlanDirPwf "task_plan.md"
if (Test-Path -LiteralPath $PlanFilePwf) {
$HadPlanId = Test-Path Env:PLAN_ID
$PreviousPlanId = $env:PLAN_ID
$HadPlanRoot = Test-Path Env:PWF_PLAN_ROOT
$PreviousPlanRoot = $env:PWF_PLAN_ROOT
try {
if ($UsePlanDir) {
$env:PWF_PLAN_ROOT = (Get-Location).Path
$env:PLAN_ID = $PlanId
} else {
Remove-Item Env:PWF_PLAN_ROOT -ErrorAction SilentlyContinue
Remove-Item Env:PLAN_ID -ErrorAction SilentlyContinue
}
@@ -384,6 +391,11 @@ if ($Mode -ne "") {
} else {
Remove-Item Env:PLAN_ID -ErrorAction SilentlyContinue
}
if ($HadPlanRoot) {
$env:PWF_PLAN_ROOT = $PreviousPlanRoot
} else {
Remove-Item Env:PWF_PLAN_ROOT -ErrorAction SilentlyContinue
}
}
}
@@ -103,6 +103,7 @@ slugify() {
# Lowercase, non-alphanumerics → '-', collapse repeats, trim leading/trailing '-'
printf '%s' "$1" \
| tr '[:upper:]' '[:lower:]' \
| tr '\r\n' '--' \
| sed -e 's/[^a-z0-9]/-/g' -e 's/-\{2,\}/-/g' -e 's/^-//' -e 's/-$//' \
| cut -c1-40
}
@@ -202,12 +203,20 @@ apply_v3_mode() {
# (c) auto-attest the plan (attestation default-on in v3 modes, security
# strand rec 1). attest-plan.sh resolves the same way init-session just
# pinned things: in slug mode PLAN_ID points at this plan dir; in legacy
# mode it is empty and the script falls back to ./task_plan.md at root.
# Run from the project root (CWD here) so both resolutions land.
# pinned things. Slug mode binds both selectors to the plan that was
# just created, so an inherited PWF_PLAN_ROOT or PLAN_ID cannot
# redirect attestation to another project or plan (#261, #237). Root
# mode clears both instead: the attester only falls back to the legacy
# ./task_plan.md when no selector is set, and a bound pin would make it
# refuse the root plan. Run from the project root (CWD here) so both
# resolutions land.
_attest="${SCRIPT_DIR}/attest-plan.sh"
if [ -f "${_attest}" ] && [ -f "${_mode_plan}" ]; then
PLAN_ID="${PLAN_ID:-}" sh "${_attest}" >/dev/null 2>&1 || true
if [ "$SLUG_MODE" -eq 1 ]; then
PWF_PLAN_ROOT="$PWD" PLAN_ID="${PLAN_ID}" sh "${_attest}" >/dev/null 2>&1 || true
else
PWF_PLAN_ROOT="" PLAN_ID="" sh "${_attest}" >/dev/null 2>&1 || true
fi
fi
}
@@ -845,7 +845,10 @@ class Injector(object):
)
raise Bail()
if plan_id:
if slug_is_valid(plan_id) and is_dir(plan_prefix + ".planning/" + plan_id):
# A linked plan directory is never selectable (#270): the same
# `[ ! -L ]` the reference applies on every branch below.
if (slug_is_valid(plan_id) and is_dir(plan_prefix + ".planning/" + plan_id)
and not is_link(plan_prefix + ".planning/" + plan_id)):
resolved = plan_prefix + ".planning/" + plan_id
scope = "scoped"
explicit = True
@@ -864,7 +867,7 @@ class Injector(object):
active = b""
if active and slug_is_valid(active):
slug = active.decode("ascii")
if is_dir(plan_prefix + ".planning/" + slug):
if is_dir(plan_prefix + ".planning/" + slug) and not is_link(plan_prefix + ".planning/" + slug):
resolved = plan_prefix + ".planning/" + slug
scope = "scoped"
if not resolved and is_dir(plan_prefix + ".planning"):
@@ -880,6 +883,8 @@ class Injector(object):
candidate = plan_prefix + ".planning/" + name
if not is_dir(candidate):
continue
if is_link(candidate):
continue
if not slug_is_valid(name):
continue
if not is_file(candidate + "/task_plan.md"):
@@ -1327,7 +1332,12 @@ def plan_is_ambiguous(plan_root, project_root, plan_id=""):
except OSError:
names = []
for name in names:
if slug_is_valid(name) and is_file(plan_root + "/" + name + "/task_plan.md"):
candidate_dir = plan_root + "/" + name
# A linked plan directory is not selectable, so it never counts (#270):
# the reference tests `[ -L "$plan_candidate_dir" ]` before `-f`.
if is_link(candidate_dir):
continue
if slug_is_valid(name) and is_file(candidate_dir + "/task_plan.md"):
count += 1
if count > 1:
return True
@@ -1364,7 +1374,7 @@ def resolve_plan_dir(env=None):
if plan_id:
if slug_is_valid(plan_id):
candidate = fs_root + "/" + plan_id
if is_dir(candidate) and within(candidate):
if is_dir(candidate) and not is_link(candidate) and within(candidate):
return found(plan_id)
return ("", "")
@@ -1382,7 +1392,7 @@ def resolve_plan_dir(env=None):
if slug_is_valid(active):
slug = active.decode("ascii")
candidate = fs_root + "/" + slug
if is_dir(candidate) and within(candidate):
if is_dir(candidate) and not is_link(candidate) and within(candidate):
return found(slug)
if is_dir(fs_root):
@@ -1398,6 +1408,8 @@ def resolve_plan_dir(env=None):
continue
if name.startswith("."):
continue
if is_link(candidate):
continue
if not slug_is_valid(name):
continue
if not is_file(candidate + "/task_plan.md"):
@@ -263,8 +263,9 @@ if [ -z "${PLAN_ID:-}" ]; then
PLAN_COUNT=1
fi
for plan_candidate in "${PLAN_PREFIX}".planning/*/task_plan.md; do
[ -f "$plan_candidate" ] || continue
plan_candidate_dir="${plan_candidate%/task_plan.md}"
[ -L "$plan_candidate_dir" ] && continue
[ -f "$plan_candidate" ] || continue
slug_is_valid "${plan_candidate_dir##*/}" || continue
PLAN_COUNT=$((PLAN_COUNT + 1))
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
@@ -295,7 +296,9 @@ if [ -n "${PLAN_ID:-}" ]; then
# 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
# A linked plan directory is never selectable (#270): same `-L` rule as
# the counter above and as resolve-plan-dir.sh, on every branch below.
if slug_is_valid "$PLAN_ID" && [ -d "${PLAN_PREFIX}.planning/${PLAN_ID}" ] && [ ! -L "${PLAN_PREFIX}.planning/${PLAN_ID}" ]; then
RESOLVED="${PLAN_PREFIX}.planning/${PLAN_ID}"; SCOPE="scoped"; EXPLICIT=1
else
if [ "$CONTEXT" = "userprompt" ]; then
@@ -305,7 +308,7 @@ if [ -n "${PLAN_ID:-}" ]; then
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
if [ -n "$AP" ] && slug_is_valid "$AP" && [ -d "${PLAN_PREFIX}.planning/${AP}" ] && [ ! -L "${PLAN_PREFIX}.planning/${AP}" ]; then
RESOLVED="${PLAN_PREFIX}.planning/${AP}"; SCOPE="scoped"
fi
fi
@@ -314,6 +317,7 @@ if [ -z "$RESOLVED" ] && [ -d "${PLAN_PREFIX}.planning" ]; then
for d in "${PLAN_PREFIX}".planning/*/; do
d="${d%/}"; n="${d##*/}"
case "$n" in .*) continue;; esac
[ -L "$d" ] && continue
slug_is_valid "$n" || continue
[ -f "$d/task_plan.md" ] || continue
m=$(stat -c '%Y' "$d" 2>/dev/null || stat -f '%m' "$d" 2>/dev/null || date -r "$d" +%s 2>/dev/null || echo 0)
@@ -139,6 +139,23 @@ function Test-WithinRoot {
return $candNorm.StartsWith($rootNorm + [System.IO.Path]::DirectorySeparatorChar, [System.StringComparison]::OrdinalIgnoreCase)
}
# A linked plan directory (symlink or junction) is never selectable: not by
# PLAN_ID, not by the pointer, not by the newest scan, and it never counts
# (#270). This is `[ -L ]` of resolve-plan-dir.sh and is_link of the Python
# twin: LinkType names symlinks and junctions only. The ReparsePoint
# attribute alone would also match OneDrive Files On-Demand placeholders,
# which every synced directory carries and which are not links to sh.
function Test-LinkedDirectory {
param($PathOrItem)
if ($PathOrItem -is [string]) {
$item = Get-Item -LiteralPath $PathOrItem -Force -ErrorAction SilentlyContinue
} else {
$item = $PathOrItem
}
if (-not $item) { return $false }
return ([string]$item.LinkType) -in @('SymbolicLink', 'Junction')
}
$activeFile = Join-Path $PlanRoot ".active_plan"
# A set PLAN_ID is a BINDING, not a hint (issue #237). A selector that names
@@ -158,6 +175,9 @@ if (-not $env:PLAN_ID) {
}
if (Test-Path -LiteralPath $PlanRoot -PathType Container) {
foreach ($entry in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue)) {
# A linked plan directory (symlink, junction) is not selectable and
# never counts, matching `[ -L ]` in resolve-plan-dir.sh (#270).
if (Test-LinkedDirectory $entry) { continue }
if ((Test-ValidSlug $entry.Name) -and
(Test-Path -LiteralPath (Join-Path $entry.FullName "task_plan.md") -PathType Leaf)) {
$planCount++
@@ -175,7 +195,7 @@ if ($planCount -gt 1) { exit 0 }
if ($env:PLAN_ID) {
if (Test-ValidSlug $env:PLAN_ID) {
$candidate = Join-Path $PlanRoot $env:PLAN_ID
if ((Test-Path -LiteralPath $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
if ((Test-Path -LiteralPath $candidate -PathType Container) -and -not (Test-LinkedDirectory $candidate) -and (Test-WithinRoot $candidate)) {
Write-Output $candidate
exit 0
}
@@ -198,7 +218,7 @@ if ($activeItem) {
$planId = "$(Get-Content -LiteralPath $activeFile -Raw -ErrorAction SilentlyContinue)".Trim()
if ($planId -and (Test-ValidSlug $planId)) {
$candidate = Join-Path $PlanRoot $planId
if ((Test-Path -LiteralPath $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
if ((Test-Path -LiteralPath $candidate -PathType Container) -and -not (Test-LinkedDirectory $candidate) -and (Test-WithinRoot $candidate)) {
Write-Output $candidate
exit 0
}
@@ -211,6 +231,7 @@ if ($activeItem) {
if (Test-Path -LiteralPath $PlanRoot -PathType Container) {
$latest = Get-ChildItem -LiteralPath $PlanRoot -Directory |
Where-Object { -not $_.Name.StartsWith('.') } |
Where-Object { -not (Test-LinkedDirectory $_) } |
Where-Object { Test-ValidSlug $_.Name } |
Where-Object { Test-Path -LiteralPath (Join-Path $_.FullName "task_plan.md") -PathType Leaf } |
Where-Object { Test-WithinRoot $_.FullName } |
@@ -246,10 +246,16 @@ mtime_of() {
printf "0\n"
}
# A linked plan directory (symlink or junction; `-L` sees both under Git
# Bash) is never selectable: not by PLAN_ID, not by the pointer, not by the
# newest-mtime scan, and it never counts below (#270). Containment alone let
# a link that stays inside the root be selected while the counter skipped
# it, so one real plan plus a newer linked one became an mtime guess again.
resolve_from_env() {
plan_id="${PLAN_ID:-}"
slug_is_valid "${plan_id}" || return 1
candidate="${PLAN_ROOT}/${plan_id}"
[ -L "${candidate}" ] && return 1
if [ -d "${candidate}" ] && is_within_root "${candidate}"; then
printf "%s\n" "${candidate}"
return 0
@@ -268,6 +274,7 @@ resolve_from_active_file() {
esac
slug_is_valid "${plan_id}" || return 1
candidate="${PLAN_ROOT}/${plan_id}"
[ -L "${candidate}" ] && return 1
if [ -d "${candidate}" ] && is_within_root "${candidate}"; then
printf "%s\n" "${candidate}"
return 0
@@ -288,6 +295,7 @@ resolve_latest_dir() {
case "${name}" in
.*) continue ;;
esac
[ -L "${clean}" ] && continue
slug_is_valid "${name}" || continue
[ -f "${clean}/task_plan.md" ] || continue
is_within_root "${clean}" || continue
@@ -338,8 +346,9 @@ if [ -z "${PLAN_ID:-}" ]; then
PLAN_COUNT=1
fi
for plan_candidate in "${PLAN_ROOT}"/*/task_plan.md; do
[ -f "$plan_candidate" ] || continue
plan_candidate_dir="${plan_candidate%/task_plan.md}"
[ -L "$plan_candidate_dir" ] && continue
[ -f "$plan_candidate" ] || continue
slug_is_valid "${plan_candidate_dir##*/}" || continue
PLAN_COUNT=$((PLAN_COUNT + 1))
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
@@ -474,7 +474,7 @@ def _format_opencode_part(data: Dict[str, Any], session_id: str) -> Optional[Dic
tool = (data.get('tool') or '').lower()
state = data.get('state') or {}
input_ = state.get('input') if isinstance(state, dict) else None
input_ = input_ or {}
input_ = input_ if isinstance(input_, dict) else {}
outcome = _opencode_state_annotation(state)
if tool in ('write', 'edit'):
fp = input_.get('filePath', '')
@@ -577,6 +577,7 @@ def opencode_catchup(project_path: str, mode: str = 'no-history') -> None:
"""
SELECT time_created, data FROM part
WHERE session_id = ?
AND json_valid(data)
AND json_extract(data, '$.type') = 'tool'
AND lower(json_extract(data, '$.tool')) IN ('write', 'edit', 'patch')
AND (
@@ -204,6 +204,8 @@ function Show-PlanList {
Write-Output "[active] marks the shared .active_plan pointer; listing does not bind this session."
$found = $false
foreach ($plan in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue | Sort-Object Name)) {
# A linked plan directory is never a plan (#270): no resolver selects it.
if (([string]$plan.LinkType) -in @('SymbolicLink', 'Junction')) { continue }
if (-not (Test-ValidSlug $plan.Name) -or -not (Test-WithinRoot $plan.FullName)) { continue }
$planFile = Join-Path $plan.FullName "task_plan.md"
if (-not (Test-Path -LiteralPath $planFile -PathType Leaf) -or -not (Test-WithinRoot $planFile)) { continue }
@@ -281,6 +283,11 @@ if (-not (Test-Path -LiteralPath $PlanDir -PathType Container)) {
Write-Error "Run: init-session.sh `"$PlanId`" to create it, or check .planning\ for available plans."
exit 1
}
$planDirItem = Get-Item -LiteralPath $PlanDir -Force -ErrorAction SilentlyContinue
if ($planDirItem -and (([string]$planDirItem.LinkType) -in @('SymbolicLink', 'Junction'))) {
Write-Error "Error: plan directory is a symlink or junction and no route selects it: $PlanDir"
exit 1
}
if (-not (Test-WithinRoot $PlanRoot) -or -not (Test-WithinRoot $PlanDir)) {
Write-Error "Error: plan directory must remain within the project."
exit 1
@@ -272,6 +272,9 @@ list_plans() {
printf '%s\n' 'Available plans:'
for _dir in "${PLAN_ROOT}"/*; do
[ -d "${_dir}" ] || continue
# A linked plan directory is never a plan (#270): no resolver selects
# it, so listing it would advertise a PLAN_ID every route refuses.
[ -L "${_dir}" ] && continue
_id="${_dir##*/}"
slug_is_valid "${_id}" || continue
is_within_root "${_dir}" || continue
@@ -312,7 +315,7 @@ if [ "${1:-}" = '' ]; then
exit 1
fi
plan_id="$(current_active)"
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ] && is_within_root "${PLAN_ROOT}/${plan_id}"; then
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ] && [ ! -L "${PLAN_ROOT}/${plan_id}" ] && is_within_root "${PLAN_ROOT}/${plan_id}"; then
printf '%s\n' "Active plan: ${plan_id}" "Path: ${PLAN_ROOT}/${plan_id}"
elif [ -n "${plan_id}" ]; then
printf '%s\n' "Active plan pointer: ${plan_id} (directory not found or outside project - stale pointer)"
@@ -333,6 +336,10 @@ if [ ! -d "${PLAN_DIR}" ]; then
"Run: init-session.sh \"${PLAN_ID}\" to create it, or use --list to see available plans." >&2
exit 1
fi
if [ -L "${PLAN_DIR}" ]; then
printf '%s\n' "Error: plan directory is a symlink or junction and no route selects it: ${PLAN_DIR}" >&2
exit 1
fi
if ! is_within_root "${PLAN_ROOT}" || ! is_within_root "${PLAN_DIR}"; then
printf '%s\n' 'Error: plan directory is outside the project or cannot be verified.' >&2
exit 1
@@ -350,16 +350,23 @@ if ($Mode -ne "") {
# (c) auto-attest (attestation default-on in v3 modes, security strand rec 1).
# attest-plan.ps1 intentionally refuses non-Windows hosts because its secure
# no-follow implementation uses Win32 handles. On Unix, use the POSIX
# attester instead. Bind slug mode to the plan we just created so an
# inherited PLAN_ID cannot redirect attestation to another plan.
# attester instead. Slug mode binds PWF_PLAN_ROOT and PLAN_ID to the plan
# we just created so an inherited pin or slug cannot redirect attestation
# to another project or plan (#261, #237). Root mode clears both instead:
# the attester only falls back to the legacy ./task_plan.md when no
# selector is set, and a bound pin would make it refuse the root plan.
$PlanFilePwf = Join-Path $PlanDirPwf "task_plan.md"
if (Test-Path -LiteralPath $PlanFilePwf) {
$HadPlanId = Test-Path Env:PLAN_ID
$PreviousPlanId = $env:PLAN_ID
$HadPlanRoot = Test-Path Env:PWF_PLAN_ROOT
$PreviousPlanRoot = $env:PWF_PLAN_ROOT
try {
if ($UsePlanDir) {
$env:PWF_PLAN_ROOT = (Get-Location).Path
$env:PLAN_ID = $PlanId
} else {
Remove-Item Env:PWF_PLAN_ROOT -ErrorAction SilentlyContinue
Remove-Item Env:PLAN_ID -ErrorAction SilentlyContinue
}
@@ -384,6 +391,11 @@ if ($Mode -ne "") {
} else {
Remove-Item Env:PLAN_ID -ErrorAction SilentlyContinue
}
if ($HadPlanRoot) {
$env:PWF_PLAN_ROOT = $PreviousPlanRoot
} else {
Remove-Item Env:PWF_PLAN_ROOT -ErrorAction SilentlyContinue
}
}
}
@@ -103,6 +103,7 @@ slugify() {
# Lowercase, non-alphanumerics → '-', collapse repeats, trim leading/trailing '-'
printf '%s' "$1" \
| tr '[:upper:]' '[:lower:]' \
| tr '\r\n' '--' \
| sed -e 's/[^a-z0-9]/-/g' -e 's/-\{2,\}/-/g' -e 's/^-//' -e 's/-$//' \
| cut -c1-40
}
@@ -202,12 +203,20 @@ apply_v3_mode() {
# (c) auto-attest the plan (attestation default-on in v3 modes, security
# strand rec 1). attest-plan.sh resolves the same way init-session just
# pinned things: in slug mode PLAN_ID points at this plan dir; in legacy
# mode it is empty and the script falls back to ./task_plan.md at root.
# Run from the project root (CWD here) so both resolutions land.
# pinned things. Slug mode binds both selectors to the plan that was
# just created, so an inherited PWF_PLAN_ROOT or PLAN_ID cannot
# redirect attestation to another project or plan (#261, #237). Root
# mode clears both instead: the attester only falls back to the legacy
# ./task_plan.md when no selector is set, and a bound pin would make it
# refuse the root plan. Run from the project root (CWD here) so both
# resolutions land.
_attest="${SCRIPT_DIR}/attest-plan.sh"
if [ -f "${_attest}" ] && [ -f "${_mode_plan}" ]; then
PLAN_ID="${PLAN_ID:-}" sh "${_attest}" >/dev/null 2>&1 || true
if [ "$SLUG_MODE" -eq 1 ]; then
PWF_PLAN_ROOT="$PWD" PLAN_ID="${PLAN_ID}" sh "${_attest}" >/dev/null 2>&1 || true
else
PWF_PLAN_ROOT="" PLAN_ID="" sh "${_attest}" >/dev/null 2>&1 || true
fi
fi
}
@@ -139,6 +139,23 @@ function Test-WithinRoot {
return $candNorm.StartsWith($rootNorm + [System.IO.Path]::DirectorySeparatorChar, [System.StringComparison]::OrdinalIgnoreCase)
}
# A linked plan directory (symlink or junction) is never selectable: not by
# PLAN_ID, not by the pointer, not by the newest scan, and it never counts
# (#270). This is `[ -L ]` of resolve-plan-dir.sh and is_link of the Python
# twin: LinkType names symlinks and junctions only. The ReparsePoint
# attribute alone would also match OneDrive Files On-Demand placeholders,
# which every synced directory carries and which are not links to sh.
function Test-LinkedDirectory {
param($PathOrItem)
if ($PathOrItem -is [string]) {
$item = Get-Item -LiteralPath $PathOrItem -Force -ErrorAction SilentlyContinue
} else {
$item = $PathOrItem
}
if (-not $item) { return $false }
return ([string]$item.LinkType) -in @('SymbolicLink', 'Junction')
}
$activeFile = Join-Path $PlanRoot ".active_plan"
# A set PLAN_ID is a BINDING, not a hint (issue #237). A selector that names
@@ -158,6 +175,9 @@ if (-not $env:PLAN_ID) {
}
if (Test-Path -LiteralPath $PlanRoot -PathType Container) {
foreach ($entry in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue)) {
# A linked plan directory (symlink, junction) is not selectable and
# never counts, matching `[ -L ]` in resolve-plan-dir.sh (#270).
if (Test-LinkedDirectory $entry) { continue }
if ((Test-ValidSlug $entry.Name) -and
(Test-Path -LiteralPath (Join-Path $entry.FullName "task_plan.md") -PathType Leaf)) {
$planCount++
@@ -175,7 +195,7 @@ if ($planCount -gt 1) { exit 0 }
if ($env:PLAN_ID) {
if (Test-ValidSlug $env:PLAN_ID) {
$candidate = Join-Path $PlanRoot $env:PLAN_ID
if ((Test-Path -LiteralPath $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
if ((Test-Path -LiteralPath $candidate -PathType Container) -and -not (Test-LinkedDirectory $candidate) -and (Test-WithinRoot $candidate)) {
Write-Output $candidate
exit 0
}
@@ -198,7 +218,7 @@ if ($activeItem) {
$planId = "$(Get-Content -LiteralPath $activeFile -Raw -ErrorAction SilentlyContinue)".Trim()
if ($planId -and (Test-ValidSlug $planId)) {
$candidate = Join-Path $PlanRoot $planId
if ((Test-Path -LiteralPath $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
if ((Test-Path -LiteralPath $candidate -PathType Container) -and -not (Test-LinkedDirectory $candidate) -and (Test-WithinRoot $candidate)) {
Write-Output $candidate
exit 0
}
@@ -211,6 +231,7 @@ if ($activeItem) {
if (Test-Path -LiteralPath $PlanRoot -PathType Container) {
$latest = Get-ChildItem -LiteralPath $PlanRoot -Directory |
Where-Object { -not $_.Name.StartsWith('.') } |
Where-Object { -not (Test-LinkedDirectory $_) } |
Where-Object { Test-ValidSlug $_.Name } |
Where-Object { Test-Path -LiteralPath (Join-Path $_.FullName "task_plan.md") -PathType Leaf } |
Where-Object { Test-WithinRoot $_.FullName } |
@@ -246,10 +246,16 @@ mtime_of() {
printf "0\n"
}
# A linked plan directory (symlink or junction; `-L` sees both under Git
# Bash) is never selectable: not by PLAN_ID, not by the pointer, not by the
# newest-mtime scan, and it never counts below (#270). Containment alone let
# a link that stays inside the root be selected while the counter skipped
# it, so one real plan plus a newer linked one became an mtime guess again.
resolve_from_env() {
plan_id="${PLAN_ID:-}"
slug_is_valid "${plan_id}" || return 1
candidate="${PLAN_ROOT}/${plan_id}"
[ -L "${candidate}" ] && return 1
if [ -d "${candidate}" ] && is_within_root "${candidate}"; then
printf "%s\n" "${candidate}"
return 0
@@ -268,6 +274,7 @@ resolve_from_active_file() {
esac
slug_is_valid "${plan_id}" || return 1
candidate="${PLAN_ROOT}/${plan_id}"
[ -L "${candidate}" ] && return 1
if [ -d "${candidate}" ] && is_within_root "${candidate}"; then
printf "%s\n" "${candidate}"
return 0
@@ -288,6 +295,7 @@ resolve_latest_dir() {
case "${name}" in
.*) continue ;;
esac
[ -L "${clean}" ] && continue
slug_is_valid "${name}" || continue
[ -f "${clean}/task_plan.md" ] || continue
is_within_root "${clean}" || continue
@@ -338,8 +346,9 @@ if [ -z "${PLAN_ID:-}" ]; then
PLAN_COUNT=1
fi
for plan_candidate in "${PLAN_ROOT}"/*/task_plan.md; do
[ -f "$plan_candidate" ] || continue
plan_candidate_dir="${plan_candidate%/task_plan.md}"
[ -L "$plan_candidate_dir" ] && continue
[ -f "$plan_candidate" ] || continue
slug_is_valid "${plan_candidate_dir##*/}" || continue
PLAN_COUNT=$((PLAN_COUNT + 1))
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
@@ -474,7 +474,7 @@ def _format_opencode_part(data: Dict[str, Any], session_id: str) -> Optional[Dic
tool = (data.get('tool') or '').lower()
state = data.get('state') or {}
input_ = state.get('input') if isinstance(state, dict) else None
input_ = input_ or {}
input_ = input_ if isinstance(input_, dict) else {}
outcome = _opencode_state_annotation(state)
if tool in ('write', 'edit'):
fp = input_.get('filePath', '')
@@ -577,6 +577,7 @@ def opencode_catchup(project_path: str, mode: str = 'no-history') -> None:
"""
SELECT time_created, data FROM part
WHERE session_id = ?
AND json_valid(data)
AND json_extract(data, '$.type') = 'tool'
AND lower(json_extract(data, '$.tool')) IN ('write', 'edit', 'patch')
AND (
@@ -204,6 +204,8 @@ function Show-PlanList {
Write-Output "[active] marks the shared .active_plan pointer; listing does not bind this session."
$found = $false
foreach ($plan in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue | Sort-Object Name)) {
# A linked plan directory is never a plan (#270): no resolver selects it.
if (([string]$plan.LinkType) -in @('SymbolicLink', 'Junction')) { continue }
if (-not (Test-ValidSlug $plan.Name) -or -not (Test-WithinRoot $plan.FullName)) { continue }
$planFile = Join-Path $plan.FullName "task_plan.md"
if (-not (Test-Path -LiteralPath $planFile -PathType Leaf) -or -not (Test-WithinRoot $planFile)) { continue }
@@ -281,6 +283,11 @@ if (-not (Test-Path -LiteralPath $PlanDir -PathType Container)) {
Write-Error "Run: init-session.sh `"$PlanId`" to create it, or check .planning\ for available plans."
exit 1
}
$planDirItem = Get-Item -LiteralPath $PlanDir -Force -ErrorAction SilentlyContinue
if ($planDirItem -and (([string]$planDirItem.LinkType) -in @('SymbolicLink', 'Junction'))) {
Write-Error "Error: plan directory is a symlink or junction and no route selects it: $PlanDir"
exit 1
}
if (-not (Test-WithinRoot $PlanRoot) -or -not (Test-WithinRoot $PlanDir)) {
Write-Error "Error: plan directory must remain within the project."
exit 1
@@ -272,6 +272,9 @@ list_plans() {
printf '%s\n' 'Available plans:'
for _dir in "${PLAN_ROOT}"/*; do
[ -d "${_dir}" ] || continue
# A linked plan directory is never a plan (#270): no resolver selects
# it, so listing it would advertise a PLAN_ID every route refuses.
[ -L "${_dir}" ] && continue
_id="${_dir##*/}"
slug_is_valid "${_id}" || continue
is_within_root "${_dir}" || continue
@@ -312,7 +315,7 @@ if [ "${1:-}" = '' ]; then
exit 1
fi
plan_id="$(current_active)"
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ] && is_within_root "${PLAN_ROOT}/${plan_id}"; then
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ] && [ ! -L "${PLAN_ROOT}/${plan_id}" ] && is_within_root "${PLAN_ROOT}/${plan_id}"; then
printf '%s\n' "Active plan: ${plan_id}" "Path: ${PLAN_ROOT}/${plan_id}"
elif [ -n "${plan_id}" ]; then
printf '%s\n' "Active plan pointer: ${plan_id} (directory not found or outside project - stale pointer)"
@@ -333,6 +336,10 @@ if [ ! -d "${PLAN_DIR}" ]; then
"Run: init-session.sh \"${PLAN_ID}\" to create it, or use --list to see available plans." >&2
exit 1
fi
if [ -L "${PLAN_DIR}" ]; then
printf '%s\n' "Error: plan directory is a symlink or junction and no route selects it: ${PLAN_DIR}" >&2
exit 1
fi
if ! is_within_root "${PLAN_ROOT}" || ! is_within_root "${PLAN_DIR}"; then
printf '%s\n' 'Error: plan directory is outside the project or cannot be verified.' >&2
exit 1
@@ -1,12 +1,21 @@
from __future__ import annotations
import importlib
import json
import os
import shlex
from pathlib import Path
from typing import Any
from .hooks import post_tool_call, pre_llm_call, pre_verify
from .paths import normalize_cwd, plugin_skill_dir
from .hooks import (
WORKTREES_DIR_NAME,
launch_dir_has_planning_state,
launch_dir_notice,
post_tool_call,
pre_llm_call,
pre_verify,
)
from .paths import effective_project_root, normalize_cwd, plan_root_is_pinned, plugin_skill_dir
from .tools import (
planning_with_files_check_complete,
planning_with_files_init,
@@ -14,10 +23,25 @@ from .tools import (
)
SLASH_COMMANDS = ("pwf", "pwf-status", "plan-status")
BROKEN_PIN_MESSAGE = (
"planning-with-files: PWF_PLAN_ROOT is set but does not resolve to an absolute, "
"existing directory; nothing done."
)
def _command_cwd() -> Path:
"""Project directory for a slash command: the Hermes session cwd, else the process cwd."""
def _command_cwd() -> Path | None:
"""Project directory for a slash command.
The PWF_PLAN_ROOT pin wins, exactly as it does for the hooks, and a broken
pin returns None instead of a fallback (issue #272: on Hermes 0.21.3 the
session cwd can name the home directory, and a pinned operator must not
get a plan created or reported there). Without a pin: the Hermes session
cwd, else the process cwd. A command handler receives only its arguments,
no platform or session, so the CLI-only launch-directory rule of the hooks
cannot be applied here; the pin is the documented answer for commands.
"""
if plan_root_is_pinned():
return effective_project_root(normalize_cwd())
try:
from agent.runtime_cwd import resolve_agent_cwd
@@ -81,6 +105,8 @@ def pwf_command(raw_args: str = "") -> str:
name_parts.append(token)
index += 1
project_dir = _command_cwd()
if project_dir is None:
return BROKEN_PIN_MESSAGE
result = json.loads(
planning_with_files_init(
template=template, cwd=str(project_dir), name=" ".join(name_parts), mode=mode
@@ -97,14 +123,61 @@ def pwf_command(raw_args: str = "") -> str:
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.")
if not plan_root_is_pinned():
# Issue #272: the plan just went where Hermes pointed while the launch
# directory already holds one; say so instead of leaving two plans apart.
hint = _launch_dir_hint(project_dir)
if hint:
lines.append(hint)
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()
if project_dir is None:
return BROKEN_PIN_MESSAGE
payload = json.loads(planning_with_files_status(cwd=str(project_dir)))
return _format_status(payload)
report = _format_status(payload)
if not payload.get("exists") and not plan_root_is_pinned():
hint = _launch_dir_hint(project_dir)
if hint:
report = "\n".join((report, hint))
return report
def _session_cwd_is_pinned() -> bool:
"""True when Hermes pinned this context's cwd per session (``agent.runtime_cwd._SESSION_CWD``).
A pinned context runs in a multi-session backend whose process cwd is the
backend's start directory, not a launch directory, so the hint would
compare the wrong things. Prompt turns on the TUI and Desktop carry the
pin; their plugin command dispatch does not, so this is a best-effort
exemption. Read-only inspection; any failure counts as not pinned.
"""
try:
value = importlib.import_module("agent.runtime_cwd")._SESSION_CWD.get()
except Exception: # noqa: BLE001 - a host without the pin keeps the hint
return False
return isinstance(value, str) and bool(value.strip())
def _launch_dir_hint(project_dir: Path) -> str:
"""Issue #272 diagnostic for the slash commands: name the launch directory's plan.
Read-only and platform-blind (a command handler has no platform), so it is
a hint under the report, never a refusal. Worktree sessions and sessions
whose cwd Hermes pinned per session are exempt.
"""
if WORKTREES_DIR_NAME in project_dir.parts or _session_cwd_is_pinned():
return ""
try:
launch = normalize_cwd(os.getcwd())
if not launch.is_dir() or launch == project_dir or not launch_dir_has_planning_state(launch):
return ""
except (OSError, RuntimeError, ValueError):
return ""
return launch_dir_notice(project_dir, launch)
def _register_commands(ctx: Any) -> None:
+73 -58
View File
@@ -9,27 +9,22 @@ 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 (
MULTIPLE_PLANS_NOTICE,
ambiguity_notice,
attestation_path_for,
effective_project_root,
multiple_plans_require_selector,
normalize_cwd,
plan_id_for,
plan_root_is_pinned,
resolve_plan,
resolve_plan_dir,
slug_is_valid,
)
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)
SESSION_PLAN_BINDING_NOTICE = (
"[planning-with-files] Multiple plans are available while session isolation "
"is armed. Set PLAN_ID=<slug> for this session; nothing injected."
)
def _runtime_project_dir(kwargs: dict[str, Any]) -> Path | None:
"""Resolve the active Hermes project, never a cached import-time cwd.
@@ -59,6 +54,66 @@ def _runtime_project_dir(kwargs: dict[str, Any]) -> Path | None:
return effective_project_root(project)
WORKTREES_DIR_NAME = ".worktrees" # hermes -w and /worktree new place trees at <repo>/.worktrees/<name>
def launch_dir_has_planning_state(launch: Path) -> bool:
"""True when the process launch directory holds a plan, or several plans.
A plan with a nested-root conflict still counts (``explicit=True`` skips
only that check), because the question here is whether the directory the
session was started in carries planning state at all.
"""
return (
resolve_plan(launch, explicit=True)[0] is not None
or multiple_plans_require_selector(launch)
)
def launch_dir_notice(project_dir: Path, launch: Path) -> str:
"""The once-per-turn line for issue #272; the resolved root and the launch directory differ."""
return (
f"[planning-with-files] Hermes resolved {project_dir} as the working directory, "
f"but the launch directory {launch} holds a plan. Nothing injected. "
f"Pin the thread with PWF_PLAN_ROOT={launch}."
)
def _launch_dir_notice(project_dir: Path, kwargs: dict[str, Any]) -> str | None:
"""Issue #272: the resolved root holds no plan while the launch directory does.
Hermes 0.21.3 rewrites the process-global TERMINAL_CWD during the first
turn of a CLI session (``agent/relay_runtime.py`` imports ``gateway/run.py``
lazily; its import-time bridge applies the ``Path.home()`` fallback), so
``resolve_agent_cwd`` names the home directory while ``os.getcwd()`` still
names the directory the session was started in (upstream hermes-agent
#86411 and #95577). The rewrite runs before the first hook, so the adapter
cannot recover the root on its own and never switches to the launch
directory: it says why nothing was injected and names the pin.
Silent by design: platforms other than the CLI (their process cwd is not a
launch directory), Hermes worktree sessions (``hermes -w`` points
TERMINAL_CWD at ``<repo>/.worktrees/<name>`` without a chdir, which is the
intended split), a launch directory without planning state, and a launch
directory whose session isolation refuses this session anyway.
"""
if str(kwargs.get("platform", "")).strip().lower() != "cli":
return None
if WORKTREES_DIR_NAME in project_dir.parts:
return None
try:
launch = normalize_cwd(os.getcwd())
if not launch.is_dir() or launch == project_dir:
return None
if _session_attachment(launch, _session_id(kwargs)) == ATTACH_DETACHED:
return None
if not launch_dir_has_planning_state(launch):
return None
except (OSError, RuntimeError, ValueError):
return None
return launch_dir_notice(project_dir, launch)
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"
@@ -84,50 +139,6 @@ def _session_attachment(project_dir: Path, session_id: str) -> str:
return ATTACH_DETACHED
def _is_live_plan_file(path: Path) -> bool:
try:
info = path.lstat()
except OSError:
return False
attrs = getattr(info, "st_file_attributes", 0)
return (
stat.S_ISREG(info.st_mode)
and not stat.S_ISLNK(info.st_mode)
and not attrs & getattr(stat, "FILE_ATTRIBUTE_REPARSE_POINT", 0x400)
)
def _session_plan_requires_binding(project_dir: Path) -> bool:
"""True when an attached session must select a same-root plan by PLAN_ID."""
if os.environ.get("PLAN_ID", "").strip():
return False
candidates = 1 if _is_live_plan_file(project_dir / "task_plan.md") else 0
planning_dir = project_dir / ".planning"
try:
children = planning_dir.iterdir()
for child in children:
if not slug_is_valid(child.name):
continue
try:
info = child.lstat()
except OSError:
continue
attrs = getattr(info, "st_file_attributes", 0)
if (
not stat.S_ISDIR(info.st_mode)
or stat.S_ISLNK(info.st_mode)
or attrs & getattr(stat, "FILE_ATTRIBUTE_REPARSE_POINT", 0x400)
):
continue
if _is_live_plan_file(child / "task_plan.md"):
candidates += 1
if candidates > 1:
return True
except (OSError, RuntimeError):
return True
return False
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)
@@ -148,7 +159,7 @@ def _session_id(kwargs: dict[str, Any]) -> str:
def _locate(
kwargs: dict[str, Any],
) -> tuple[Path | None, Path | None, list[str], str, bool]:
"""Shared front half: project, plan, conflicts, session id, binding refusal.
"""Shared front half: project, plan, conflicts, session id, selector refusal.
PWF_PLAN_ROOT selects the effective project root. PLAN_ID selects a plan
within it. A session attachment is admission only and never skips either
@@ -161,7 +172,7 @@ def _locate(
attachment = _session_attachment(project_dir, session_id)
if attachment == ATTACH_DETACHED:
return project_dir, None, [], session_id, False
if attachment == ATTACH_ATTACHED and _session_plan_requires_binding(project_dir):
if multiple_plans_require_selector(project_dir):
return project_dir, None, [], session_id, True
explicit = plan_root_is_pinned()
plan_dir, conflicts = _resolve_plan(project_dir, explicit=explicit)
@@ -213,16 +224,20 @@ def build_user_prompt_context(project_dir: Path, plan_dir: Path | None = None) -
def pre_llm_call(**kwargs: Any) -> dict[str, str] | None:
project_dir, plan_dir, conflicts, session_id, binding_required = _locate(kwargs)
project_dir, plan_dir, conflicts, session_id, selector_required = _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 binding_required:
return {"context": SESSION_PLAN_BINDING_NOTICE}
if selector_required:
return {"context": MULTIPLE_PLANS_NOTICE}
if conflicts:
return {"context": ambiguity_notice(conflicts)}
if not plan_root_is_pinned():
notice = _launch_dir_notice(project_dir, kwargs)
if notice:
return {"context": notice}
return None
user_message = str(kwargs.get("user_message", ""))
reminder_messages = pop_reminders(project_dir, session_id)
@@ -252,7 +267,7 @@ def post_tool_call(**kwargs: Any) -> None:
return None
else:
return None
project_dir, plan_dir, _conflicts, session_id, _binding_required = _locate(kwargs)
project_dir, plan_dir, _conflicts, session_id, _selector_required = _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."
@@ -269,7 +284,7 @@ def pre_verify(**kwargs: Any) -> dict[str, str] | None:
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, _binding_required = _locate(kwargs)
project_dir, plan_dir, _conflicts, _session_id, _selector_required = _locate(kwargs)
if project_dir is None or plan_dir is None:
return None
try:
+67 -7
View File
@@ -12,6 +12,11 @@ SKILL_DIR_NAME = "planning-with-files"
# 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)
MULTIPLE_PLANS_NOTICE = (
"[planning-with-files] Multiple plans are available. "
"Set PLAN_ID=<slug> for this session; nothing injected."
)
MULTIPLE_PLANS_MESSAGE = "Multiple plans are available. Set PLAN_ID=<slug> to select one."
def has_skill_assets(candidate: Path) -> bool:
@@ -136,6 +141,16 @@ def _is_regular_file(path: Path) -> bool:
return stat.S_ISREG(info.st_mode)
def _is_real_dir(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_ISDIR(info.st_mode)
def slug_is_valid(slug: str) -> bool:
return bool(slug) and _SLUG_RE.match(slug) is not None
@@ -197,6 +212,39 @@ def _read_active_pointer(planning_root: Path) -> str:
return lines[0] if len(lines) == 1 else ""
def count_selectable_plans(project_dir: Path) -> int:
"""Count plans exactly as inject-plan.sh does before guessing a selection.
A legacy root plan counts only after session isolation is armed. Every
contained valid slug directory with a regular task_plan.md counts. The
caller only needs to distinguish zero/one from "more than one", so stop at
two.
"""
planning_root = project_dir / ".planning"
count = 0
if _is_real_dir(planning_root / "sessions") and _is_regular_file(project_dir / "task_plan.md"):
count = 1
try:
entries = list(planning_root.iterdir())
except OSError:
return count
for entry in entries:
if not slug_is_valid(entry.name):
continue
if _slug_plan_dir(planning_root, entry.name) is None:
continue
count += 1
if count > 1:
break
return count
def multiple_plans_require_selector(project_dir: Path, *, plan_id: str | None = None) -> bool:
"""True when shared pointer/mtime guesses cannot identify this session's plan."""
requested = plan_id if plan_id is not None else os.environ.get("PLAN_ID", "").strip()
return not requested and count_selectable_plans(project_dir) > 1
def nested_live_plans(root: Path) -> list[str]:
"""Direct children whose own .planning holds a live plan (<slug>/task_plan.md).
@@ -236,17 +284,23 @@ def resolve_plan(
) -> 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).
Precedence mirrors resolve-plan-dir.sh: a non-empty explicit plan id (the
PLAN_ID environment variable when not passed) is binding. Without one,
more than one selectable same-root plan is refused; otherwise resolution
continues through .planning/.active_plan, 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 linked plan directory
never counts and never resolves here; since v3.20.3 the shell family, the
Python twin, the Codex adapter and the OpenCode and DSH cores apply the
same rule (#270).
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 or a ``PLAN_ID`` slug.
project-root selection that skips only that nested-root check, exactly as
inject-plan.sh does for a valid ``PWF_PLAN_ROOT`` pin. It never selects one
of several same-root plans; that still requires ``PLAN_ID``.
"""
planning_root = project_dir / ".planning"
requested = plan_id if plan_id is not None else os.environ.get("PLAN_ID", "").strip()
@@ -271,6 +325,12 @@ def resolve_plan(
return explicit_dir, []
return None, []
# A shared .active_plan pointer or directory mtime cannot identify which
# same-root task this session owns. PWF_PLAN_ROOT selects the project, not
# one of its plans, so even an explicit root pin does not lift this refusal.
if count_selectable_plans(project_dir) > 1:
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)
@@ -9,7 +9,9 @@ from typing import Any
from .constants import PLANNING_FILES, PLAN_PREVIEW_LINES, PROGRESS_TAIL_LINES
from .paths import (
MULTIPLE_PLANS_MESSAGE,
attestation_path_for,
multiple_plans_require_selector,
plan_id_for,
resolve_plan_dir,
resolve_skill_dir,
@@ -425,9 +427,14 @@ def evaluate_gate(project_dir: Path, plan_dir: Path) -> str | None:
def summarize_status(project_dir: Path) -> dict[str, Any]:
plan_dir = resolve_plan_dir(project_dir)
if plan_dir is None:
message = (
MULTIPLE_PLANS_MESSAGE
if multiple_plans_require_selector(project_dir)
else "No planning files found. Run planning_with_files_init first."
)
return {
"exists": False,
"message": "No planning files found. Run planning_with_files_init first.",
"message": message,
"project_dir": str(project_dir),
"files": {
"task_plan.md": False,
@@ -1,5 +1,5 @@
name: planning-with-files
version: 0.2.1
version: 0.2.2
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:
+13 -2
View File
@@ -3,7 +3,14 @@ import shutil
import subprocess
from pathlib import Path
from .paths import normalize_cwd, plan_id_for, resolve_plan_dir, resolve_skill_dir
from .paths import (
MULTIPLE_PLANS_MESSAGE,
multiple_plans_require_selector,
normalize_cwd,
plan_id_for,
resolve_plan_dir,
resolve_skill_dir,
)
from .planning_files import init_plan, phase_counts, summarize_status
@@ -49,7 +56,11 @@ def planning_with_files_check_complete(cwd: str = "") -> str:
return json.dumps(
{
"ok": False,
"error": "No task_plan.md found. Run planning_with_files_init first.",
"error": (
MULTIPLE_PLANS_MESSAGE
if multiple_plans_require_selector(project_dir)
else "No task_plan.md found. Run planning_with_files_init first."
),
"skill_root": str(skill_root),
"complete": False,
},
+1 -1
View File
@@ -2,7 +2,7 @@
name: planning-with-files
description: "Persistent file-based planning for multi-step AI-agent work. Keeps task_plan.md, findings.md, and progress.md on disk; lifecycle hooks inject selected project planning context. Automatic recovery reads project planning files only. Explicit session-catchup.py --metadata reads same-project local agent session records and emits aggregate counts only; --replay may emit bounded nonce-framed excerpts. Optional gated mode can request continuation only when the host supports it and never runs commands declared in Markdown. The skill has no network upload path. Use for research or work needing 5+ tool calls."
metadata:
version: "3.20.0"
version: "3.20.3"
hermes:
tags: [planning, long-running-tasks, context-engineering, workflow]
---
@@ -204,6 +204,8 @@ function Show-PlanList {
Write-Output "[active] marks the shared .active_plan pointer; listing does not bind this session."
$found = $false
foreach ($plan in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue | Sort-Object Name)) {
# A linked plan directory is never a plan (#270): no resolver selects it.
if (([string]$plan.LinkType) -in @('SymbolicLink', 'Junction')) { continue }
if (-not (Test-ValidSlug $plan.Name) -or -not (Test-WithinRoot $plan.FullName)) { continue }
$planFile = Join-Path $plan.FullName "task_plan.md"
if (-not (Test-Path -LiteralPath $planFile -PathType Leaf) -or -not (Test-WithinRoot $planFile)) { continue }
@@ -281,6 +283,11 @@ if (-not (Test-Path -LiteralPath $PlanDir -PathType Container)) {
Write-Error "Run: init-session.sh `"$PlanId`" to create it, or check .planning\ for available plans."
exit 1
}
$planDirItem = Get-Item -LiteralPath $PlanDir -Force -ErrorAction SilentlyContinue
if ($planDirItem -and (([string]$planDirItem.LinkType) -in @('SymbolicLink', 'Junction'))) {
Write-Error "Error: plan directory is a symlink or junction and no route selects it: $PlanDir"
exit 1
}
if (-not (Test-WithinRoot $PlanRoot) -or -not (Test-WithinRoot $PlanDir)) {
Write-Error "Error: plan directory must remain within the project."
exit 1
@@ -272,6 +272,9 @@ list_plans() {
printf '%s\n' 'Available plans:'
for _dir in "${PLAN_ROOT}"/*; do
[ -d "${_dir}" ] || continue
# A linked plan directory is never a plan (#270): no resolver selects
# it, so listing it would advertise a PLAN_ID every route refuses.
[ -L "${_dir}" ] && continue
_id="${_dir##*/}"
slug_is_valid "${_id}" || continue
is_within_root "${_dir}" || continue
@@ -312,7 +315,7 @@ if [ "${1:-}" = '' ]; then
exit 1
fi
plan_id="$(current_active)"
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ] && is_within_root "${PLAN_ROOT}/${plan_id}"; then
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ] && [ ! -L "${PLAN_ROOT}/${plan_id}" ] && is_within_root "${PLAN_ROOT}/${plan_id}"; then
printf '%s\n' "Active plan: ${plan_id}" "Path: ${PLAN_ROOT}/${plan_id}"
elif [ -n "${plan_id}" ]; then
printf '%s\n' "Active plan pointer: ${plan_id} (directory not found or outside project - stale pointer)"
@@ -333,6 +336,10 @@ if [ ! -d "${PLAN_DIR}" ]; then
"Run: init-session.sh \"${PLAN_ID}\" to create it, or use --list to see available plans." >&2
exit 1
fi
if [ -L "${PLAN_DIR}" ]; then
printf '%s\n' "Error: plan directory is a symlink or junction and no route selects it: ${PLAN_DIR}" >&2
exit 1
fi
if ! is_within_root "${PLAN_ROOT}" || ! is_within_root "${PLAN_DIR}"; then
printf '%s\n' 'Error: plan directory is outside the project or cannot be verified.' >&2
exit 1
@@ -36,7 +36,7 @@ hooks:
- type: command
command: "SH=\"\"; for c in \"${PWF_SCRIPT_DIR}/skill-hook.sh\" \"${CLAUDE_SKILL_DIR}/scripts/skill-hook.sh\" \"$HOME/.mastracode/skills/planning-with-files/scripts/skill-hook.sh\" \"$HOME/.claude/skills/planning-with-files/scripts/skill-hook.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/skill-hook.sh\"; do [ -f \"$c\" ] && { SH=\"$c\"; break; }; done; [ -n \"$SH\" ] && sh \"$SH\" --event=precompact; exit 0"
metadata:
version: "3.20.0"
version: "3.20.3"
---
@@ -845,7 +845,10 @@ class Injector(object):
)
raise Bail()
if plan_id:
if slug_is_valid(plan_id) and is_dir(plan_prefix + ".planning/" + plan_id):
# A linked plan directory is never selectable (#270): the same
# `[ ! -L ]` the reference applies on every branch below.
if (slug_is_valid(plan_id) and is_dir(plan_prefix + ".planning/" + plan_id)
and not is_link(plan_prefix + ".planning/" + plan_id)):
resolved = plan_prefix + ".planning/" + plan_id
scope = "scoped"
explicit = True
@@ -864,7 +867,7 @@ class Injector(object):
active = b""
if active and slug_is_valid(active):
slug = active.decode("ascii")
if is_dir(plan_prefix + ".planning/" + slug):
if is_dir(plan_prefix + ".planning/" + slug) and not is_link(plan_prefix + ".planning/" + slug):
resolved = plan_prefix + ".planning/" + slug
scope = "scoped"
if not resolved and is_dir(plan_prefix + ".planning"):
@@ -880,6 +883,8 @@ class Injector(object):
candidate = plan_prefix + ".planning/" + name
if not is_dir(candidate):
continue
if is_link(candidate):
continue
if not slug_is_valid(name):
continue
if not is_file(candidate + "/task_plan.md"):
@@ -1327,7 +1332,12 @@ def plan_is_ambiguous(plan_root, project_root, plan_id=""):
except OSError:
names = []
for name in names:
if slug_is_valid(name) and is_file(plan_root + "/" + name + "/task_plan.md"):
candidate_dir = plan_root + "/" + name
# A linked plan directory is not selectable, so it never counts (#270):
# the reference tests `[ -L "$plan_candidate_dir" ]` before `-f`.
if is_link(candidate_dir):
continue
if slug_is_valid(name) and is_file(candidate_dir + "/task_plan.md"):
count += 1
if count > 1:
return True
@@ -1364,7 +1374,7 @@ def resolve_plan_dir(env=None):
if plan_id:
if slug_is_valid(plan_id):
candidate = fs_root + "/" + plan_id
if is_dir(candidate) and within(candidate):
if is_dir(candidate) and not is_link(candidate) and within(candidate):
return found(plan_id)
return ("", "")
@@ -1382,7 +1392,7 @@ def resolve_plan_dir(env=None):
if slug_is_valid(active):
slug = active.decode("ascii")
candidate = fs_root + "/" + slug
if is_dir(candidate) and within(candidate):
if is_dir(candidate) and not is_link(candidate) and within(candidate):
return found(slug)
if is_dir(fs_root):
@@ -1398,6 +1408,8 @@ def resolve_plan_dir(env=None):
continue
if name.startswith("."):
continue
if is_link(candidate):
continue
if not slug_is_valid(name):
continue
if not is_file(candidate + "/task_plan.md"):
@@ -263,8 +263,9 @@ if [ -z "${PLAN_ID:-}" ]; then
PLAN_COUNT=1
fi
for plan_candidate in "${PLAN_PREFIX}".planning/*/task_plan.md; do
[ -f "$plan_candidate" ] || continue
plan_candidate_dir="${plan_candidate%/task_plan.md}"
[ -L "$plan_candidate_dir" ] && continue
[ -f "$plan_candidate" ] || continue
slug_is_valid "${plan_candidate_dir##*/}" || continue
PLAN_COUNT=$((PLAN_COUNT + 1))
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
@@ -295,7 +296,9 @@ if [ -n "${PLAN_ID:-}" ]; then
# 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
# A linked plan directory is never selectable (#270): same `-L` rule as
# the counter above and as resolve-plan-dir.sh, on every branch below.
if slug_is_valid "$PLAN_ID" && [ -d "${PLAN_PREFIX}.planning/${PLAN_ID}" ] && [ ! -L "${PLAN_PREFIX}.planning/${PLAN_ID}" ]; then
RESOLVED="${PLAN_PREFIX}.planning/${PLAN_ID}"; SCOPE="scoped"; EXPLICIT=1
else
if [ "$CONTEXT" = "userprompt" ]; then
@@ -305,7 +308,7 @@ if [ -n "${PLAN_ID:-}" ]; then
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
if [ -n "$AP" ] && slug_is_valid "$AP" && [ -d "${PLAN_PREFIX}.planning/${AP}" ] && [ ! -L "${PLAN_PREFIX}.planning/${AP}" ]; then
RESOLVED="${PLAN_PREFIX}.planning/${AP}"; SCOPE="scoped"
fi
fi
@@ -314,6 +317,7 @@ if [ -z "$RESOLVED" ] && [ -d "${PLAN_PREFIX}.planning" ]; then
for d in "${PLAN_PREFIX}".planning/*/; do
d="${d%/}"; n="${d##*/}"
case "$n" in .*) continue;; esac
[ -L "$d" ] && continue
slug_is_valid "$n" || continue
[ -f "$d/task_plan.md" ] || continue
m=$(stat -c '%Y' "$d" 2>/dev/null || stat -f '%m' "$d" 2>/dev/null || date -r "$d" +%s 2>/dev/null || echo 0)
@@ -246,10 +246,16 @@ mtime_of() {
printf "0\n"
}
# A linked plan directory (symlink or junction; `-L` sees both under Git
# Bash) is never selectable: not by PLAN_ID, not by the pointer, not by the
# newest-mtime scan, and it never counts below (#270). Containment alone let
# a link that stays inside the root be selected while the counter skipped
# it, so one real plan plus a newer linked one became an mtime guess again.
resolve_from_env() {
plan_id="${PLAN_ID:-}"
slug_is_valid "${plan_id}" || return 1
candidate="${PLAN_ROOT}/${plan_id}"
[ -L "${candidate}" ] && return 1
if [ -d "${candidate}" ] && is_within_root "${candidate}"; then
printf "%s\n" "${candidate}"
return 0
@@ -268,6 +274,7 @@ resolve_from_active_file() {
esac
slug_is_valid "${plan_id}" || return 1
candidate="${PLAN_ROOT}/${plan_id}"
[ -L "${candidate}" ] && return 1
if [ -d "${candidate}" ] && is_within_root "${candidate}"; then
printf "%s\n" "${candidate}"
return 0
@@ -288,6 +295,7 @@ resolve_latest_dir() {
case "${name}" in
.*) continue ;;
esac
[ -L "${clean}" ] && continue
slug_is_valid "${name}" || continue
[ -f "${clean}/task_plan.md" ] || continue
is_within_root "${clean}" || continue
@@ -338,8 +346,9 @@ if [ -z "${PLAN_ID:-}" ]; then
PLAN_COUNT=1
fi
for plan_candidate in "${PLAN_ROOT}"/*/task_plan.md; do
[ -f "$plan_candidate" ] || continue
plan_candidate_dir="${plan_candidate%/task_plan.md}"
[ -L "$plan_candidate_dir" ] && continue
[ -f "$plan_candidate" ] || continue
slug_is_valid "${plan_candidate_dir##*/}" || continue
PLAN_COUNT=$((PLAN_COUNT + 1))
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
@@ -204,6 +204,8 @@ function Show-PlanList {
Write-Output "[active] marks the shared .active_plan pointer; listing does not bind this session."
$found = $false
foreach ($plan in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue | Sort-Object Name)) {
# A linked plan directory is never a plan (#270): no resolver selects it.
if (([string]$plan.LinkType) -in @('SymbolicLink', 'Junction')) { continue }
if (-not (Test-ValidSlug $plan.Name) -or -not (Test-WithinRoot $plan.FullName)) { continue }
$planFile = Join-Path $plan.FullName "task_plan.md"
if (-not (Test-Path -LiteralPath $planFile -PathType Leaf) -or -not (Test-WithinRoot $planFile)) { continue }
@@ -281,6 +283,11 @@ if (-not (Test-Path -LiteralPath $PlanDir -PathType Container)) {
Write-Error "Run: init-session.sh `"$PlanId`" to create it, or check .planning\ for available plans."
exit 1
}
$planDirItem = Get-Item -LiteralPath $PlanDir -Force -ErrorAction SilentlyContinue
if ($planDirItem -and (([string]$planDirItem.LinkType) -in @('SymbolicLink', 'Junction'))) {
Write-Error "Error: plan directory is a symlink or junction and no route selects it: $PlanDir"
exit 1
}
if (-not (Test-WithinRoot $PlanRoot) -or -not (Test-WithinRoot $PlanDir)) {
Write-Error "Error: plan directory must remain within the project."
exit 1
@@ -272,6 +272,9 @@ list_plans() {
printf '%s\n' 'Available plans:'
for _dir in "${PLAN_ROOT}"/*; do
[ -d "${_dir}" ] || continue
# A linked plan directory is never a plan (#270): no resolver selects
# it, so listing it would advertise a PLAN_ID every route refuses.
[ -L "${_dir}" ] && continue
_id="${_dir##*/}"
slug_is_valid "${_id}" || continue
is_within_root "${_dir}" || continue
@@ -312,7 +315,7 @@ if [ "${1:-}" = '' ]; then
exit 1
fi
plan_id="$(current_active)"
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ] && is_within_root "${PLAN_ROOT}/${plan_id}"; then
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ] && [ ! -L "${PLAN_ROOT}/${plan_id}" ] && is_within_root "${PLAN_ROOT}/${plan_id}"; then
printf '%s\n' "Active plan: ${plan_id}" "Path: ${PLAN_ROOT}/${plan_id}"
elif [ -n "${plan_id}" ]; then
printf '%s\n' "Active plan pointer: ${plan_id} (directory not found or outside project - stale pointer)"
@@ -333,6 +336,10 @@ if [ ! -d "${PLAN_DIR}" ]; then
"Run: init-session.sh \"${PLAN_ID}\" to create it, or use --list to see available plans." >&2
exit 1
fi
if [ -L "${PLAN_DIR}" ]; then
printf '%s\n' "Error: plan directory is a symlink or junction and no route selects it: ${PLAN_DIR}" >&2
exit 1
fi
if ! is_within_root "${PLAN_ROOT}" || ! is_within_root "${PLAN_DIR}"; then
printf '%s\n' 'Error: plan directory is outside the project or cannot be verified.' >&2
exit 1
@@ -188,8 +188,14 @@ describe("resolver", () => {
fs.writeFileSync(path.join(planning, ".active_plan"), "2026-09-02-evil\n")
expect(resolvePlan(root, {}, env).planDir).toBeNull()
expect(resolvePlan(root, {}, { ...env, PLAN_ID: "2026-09-02-evil" }).planDir).toBeNull()
// a linked plan directory never counts toward the several-plans rule (#270)
expect(countSelectablePlans(root)).toBe(0)
const real = path.join(planning, "2026-09-02-real")
fs.mkdirSync(real)
fs.writeFileSync(path.join(real, "task_plan.md"), "# REAL\n")
expect(countSelectablePlans(root)).toBe(1)
expect(resolvePlan(root, {}, env).planDir).toBe(real)
fs.rmSync(path.join(real, "task_plan.md"))
try {
fs.symlinkSync(path.join(outside, "task_plan.md"), path.join(real, "task_plan.md"), "file")
} catch {
@@ -205,6 +205,9 @@ export function countSelectablePlans(root: string): number {
}
for (const entry of entries) {
if (!slugIsValid(entry)) continue
// A linked plan directory is not selectable and never counts (#270),
// matching the shell counters, the Hermes plugin and resolvePlan below.
if (!isRealDir(path.join(planningRoot, entry))) continue
if (!isRegularFile(path.join(planningRoot, entry, "task_plan.md"))) continue
count += 1
if (count > 1) break
@@ -36,7 +36,7 @@ hooks:
- type: command
command: "SH=\"\"; for c in \"${PWF_SCRIPT_DIR}/skill-hook.sh\" \"${CLAUDE_SKILL_DIR}/scripts/skill-hook.sh\" \"$HOME/.config/opencode/skills/planning-with-files/scripts/skill-hook.sh\" \"$HOME/.opencode/skills/planning-with-files/scripts/skill-hook.sh\" \"$HOME/.claude/skills/planning-with-files/scripts/skill-hook.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/skill-hook.sh\"; do [ -f \"$c\" ] && { SH=\"$c\"; break; }; done; [ -n \"$SH\" ] && sh \"$SH\" --event=precompact; exit 0"
metadata:
version: "3.20.0"
version: "3.20.3"
---
@@ -845,7 +845,10 @@ class Injector(object):
)
raise Bail()
if plan_id:
if slug_is_valid(plan_id) and is_dir(plan_prefix + ".planning/" + plan_id):
# A linked plan directory is never selectable (#270): the same
# `[ ! -L ]` the reference applies on every branch below.
if (slug_is_valid(plan_id) and is_dir(plan_prefix + ".planning/" + plan_id)
and not is_link(plan_prefix + ".planning/" + plan_id)):
resolved = plan_prefix + ".planning/" + plan_id
scope = "scoped"
explicit = True
@@ -864,7 +867,7 @@ class Injector(object):
active = b""
if active and slug_is_valid(active):
slug = active.decode("ascii")
if is_dir(plan_prefix + ".planning/" + slug):
if is_dir(plan_prefix + ".planning/" + slug) and not is_link(plan_prefix + ".planning/" + slug):
resolved = plan_prefix + ".planning/" + slug
scope = "scoped"
if not resolved and is_dir(plan_prefix + ".planning"):
@@ -880,6 +883,8 @@ class Injector(object):
candidate = plan_prefix + ".planning/" + name
if not is_dir(candidate):
continue
if is_link(candidate):
continue
if not slug_is_valid(name):
continue
if not is_file(candidate + "/task_plan.md"):
@@ -1327,7 +1332,12 @@ def plan_is_ambiguous(plan_root, project_root, plan_id=""):
except OSError:
names = []
for name in names:
if slug_is_valid(name) and is_file(plan_root + "/" + name + "/task_plan.md"):
candidate_dir = plan_root + "/" + name
# A linked plan directory is not selectable, so it never counts (#270):
# the reference tests `[ -L "$plan_candidate_dir" ]` before `-f`.
if is_link(candidate_dir):
continue
if slug_is_valid(name) and is_file(candidate_dir + "/task_plan.md"):
count += 1
if count > 1:
return True
@@ -1364,7 +1374,7 @@ def resolve_plan_dir(env=None):
if plan_id:
if slug_is_valid(plan_id):
candidate = fs_root + "/" + plan_id
if is_dir(candidate) and within(candidate):
if is_dir(candidate) and not is_link(candidate) and within(candidate):
return found(plan_id)
return ("", "")
@@ -1382,7 +1392,7 @@ def resolve_plan_dir(env=None):
if slug_is_valid(active):
slug = active.decode("ascii")
candidate = fs_root + "/" + slug
if is_dir(candidate) and within(candidate):
if is_dir(candidate) and not is_link(candidate) and within(candidate):
return found(slug)
if is_dir(fs_root):
@@ -1398,6 +1408,8 @@ def resolve_plan_dir(env=None):
continue
if name.startswith("."):
continue
if is_link(candidate):
continue
if not slug_is_valid(name):
continue
if not is_file(candidate + "/task_plan.md"):
@@ -263,8 +263,9 @@ if [ -z "${PLAN_ID:-}" ]; then
PLAN_COUNT=1
fi
for plan_candidate in "${PLAN_PREFIX}".planning/*/task_plan.md; do
[ -f "$plan_candidate" ] || continue
plan_candidate_dir="${plan_candidate%/task_plan.md}"
[ -L "$plan_candidate_dir" ] && continue
[ -f "$plan_candidate" ] || continue
slug_is_valid "${plan_candidate_dir##*/}" || continue
PLAN_COUNT=$((PLAN_COUNT + 1))
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
@@ -295,7 +296,9 @@ if [ -n "${PLAN_ID:-}" ]; then
# 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
# A linked plan directory is never selectable (#270): same `-L` rule as
# the counter above and as resolve-plan-dir.sh, on every branch below.
if slug_is_valid "$PLAN_ID" && [ -d "${PLAN_PREFIX}.planning/${PLAN_ID}" ] && [ ! -L "${PLAN_PREFIX}.planning/${PLAN_ID}" ]; then
RESOLVED="${PLAN_PREFIX}.planning/${PLAN_ID}"; SCOPE="scoped"; EXPLICIT=1
else
if [ "$CONTEXT" = "userprompt" ]; then
@@ -305,7 +308,7 @@ if [ -n "${PLAN_ID:-}" ]; then
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
if [ -n "$AP" ] && slug_is_valid "$AP" && [ -d "${PLAN_PREFIX}.planning/${AP}" ] && [ ! -L "${PLAN_PREFIX}.planning/${AP}" ]; then
RESOLVED="${PLAN_PREFIX}.planning/${AP}"; SCOPE="scoped"
fi
fi
@@ -314,6 +317,7 @@ if [ -z "$RESOLVED" ] && [ -d "${PLAN_PREFIX}.planning" ]; then
for d in "${PLAN_PREFIX}".planning/*/; do
d="${d%/}"; n="${d##*/}"
case "$n" in .*) continue;; esac
[ -L "$d" ] && continue
slug_is_valid "$n" || continue
[ -f "$d/task_plan.md" ] || continue
m=$(stat -c '%Y' "$d" 2>/dev/null || stat -f '%m' "$d" 2>/dev/null || date -r "$d" +%s 2>/dev/null || echo 0)
@@ -246,10 +246,16 @@ mtime_of() {
printf "0\n"
}
# A linked plan directory (symlink or junction; `-L` sees both under Git
# Bash) is never selectable: not by PLAN_ID, not by the pointer, not by the
# newest-mtime scan, and it never counts below (#270). Containment alone let
# a link that stays inside the root be selected while the counter skipped
# it, so one real plan plus a newer linked one became an mtime guess again.
resolve_from_env() {
plan_id="${PLAN_ID:-}"
slug_is_valid "${plan_id}" || return 1
candidate="${PLAN_ROOT}/${plan_id}"
[ -L "${candidate}" ] && return 1
if [ -d "${candidate}" ] && is_within_root "${candidate}"; then
printf "%s\n" "${candidate}"
return 0
@@ -268,6 +274,7 @@ resolve_from_active_file() {
esac
slug_is_valid "${plan_id}" || return 1
candidate="${PLAN_ROOT}/${plan_id}"
[ -L "${candidate}" ] && return 1
if [ -d "${candidate}" ] && is_within_root "${candidate}"; then
printf "%s\n" "${candidate}"
return 0
@@ -288,6 +295,7 @@ resolve_latest_dir() {
case "${name}" in
.*) continue ;;
esac
[ -L "${clean}" ] && continue
slug_is_valid "${name}" || continue
[ -f "${clean}/task_plan.md" ] || continue
is_within_root "${clean}" || continue
@@ -338,8 +346,9 @@ if [ -z "${PLAN_ID:-}" ]; then
PLAN_COUNT=1
fi
for plan_candidate in "${PLAN_ROOT}"/*/task_plan.md; do
[ -f "$plan_candidate" ] || continue
plan_candidate_dir="${plan_candidate%/task_plan.md}"
[ -L "$plan_candidate_dir" ] && continue
[ -f "$plan_candidate" ] || continue
slug_is_valid "${plan_candidate_dir##*/}" || continue
PLAN_COUNT=$((PLAN_COUNT + 1))
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
@@ -403,7 +403,8 @@ def _format_opencode_part(data: Dict[str, Any], session_id: str) -> Optional[Dic
if ptype == 'tool':
tool = (data.get('tool') or '').lower()
state = data.get('state') or {}
input_ = state.get('input') or {}
input_ = state.get('input') if isinstance(state, dict) else None
input_ = input_ if isinstance(input_, dict) else {}
if tool in ('write', 'edit'):
fp = input_.get('filePath', '')
return {'session': short, 'summary': f"Tool {tool}: {fp}"}
@@ -505,6 +506,7 @@ def opencode_catchup(project_path: str, mode: str = 'no-history') -> None:
"""
SELECT time_created, data FROM part
WHERE session_id = ?
AND json_valid(data)
AND json_extract(data, '$.type') = 'tool'
AND lower(json_extract(data, '$.tool')) IN ('write', 'edit', 'patch')
AND (
@@ -204,6 +204,8 @@ function Show-PlanList {
Write-Output "[active] marks the shared .active_plan pointer; listing does not bind this session."
$found = $false
foreach ($plan in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue | Sort-Object Name)) {
# A linked plan directory is never a plan (#270): no resolver selects it.
if (([string]$plan.LinkType) -in @('SymbolicLink', 'Junction')) { continue }
if (-not (Test-ValidSlug $plan.Name) -or -not (Test-WithinRoot $plan.FullName)) { continue }
$planFile = Join-Path $plan.FullName "task_plan.md"
if (-not (Test-Path -LiteralPath $planFile -PathType Leaf) -or -not (Test-WithinRoot $planFile)) { continue }
@@ -281,6 +283,11 @@ if (-not (Test-Path -LiteralPath $PlanDir -PathType Container)) {
Write-Error "Run: init-session.sh `"$PlanId`" to create it, or check .planning\ for available plans."
exit 1
}
$planDirItem = Get-Item -LiteralPath $PlanDir -Force -ErrorAction SilentlyContinue
if ($planDirItem -and (([string]$planDirItem.LinkType) -in @('SymbolicLink', 'Junction'))) {
Write-Error "Error: plan directory is a symlink or junction and no route selects it: $PlanDir"
exit 1
}
if (-not (Test-WithinRoot $PlanRoot) -or -not (Test-WithinRoot $PlanDir)) {
Write-Error "Error: plan directory must remain within the project."
exit 1
@@ -272,6 +272,9 @@ list_plans() {
printf '%s\n' 'Available plans:'
for _dir in "${PLAN_ROOT}"/*; do
[ -d "${_dir}" ] || continue
# A linked plan directory is never a plan (#270): no resolver selects
# it, so listing it would advertise a PLAN_ID every route refuses.
[ -L "${_dir}" ] && continue
_id="${_dir##*/}"
slug_is_valid "${_id}" || continue
is_within_root "${_dir}" || continue
@@ -312,7 +315,7 @@ if [ "${1:-}" = '' ]; then
exit 1
fi
plan_id="$(current_active)"
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ] && is_within_root "${PLAN_ROOT}/${plan_id}"; then
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ] && [ ! -L "${PLAN_ROOT}/${plan_id}" ] && is_within_root "${PLAN_ROOT}/${plan_id}"; then
printf '%s\n' "Active plan: ${plan_id}" "Path: ${PLAN_ROOT}/${plan_id}"
elif [ -n "${plan_id}" ]; then
printf '%s\n' "Active plan pointer: ${plan_id} (directory not found or outside project - stale pointer)"
@@ -333,6 +336,10 @@ if [ ! -d "${PLAN_DIR}" ]; then
"Run: init-session.sh \"${PLAN_ID}\" to create it, or use --list to see available plans." >&2
exit 1
fi
if [ -L "${PLAN_DIR}" ]; then
printf '%s\n' "Error: plan directory is a symlink or junction and no route selects it: ${PLAN_DIR}" >&2
exit 1
fi
if ! is_within_root "${PLAN_ROOT}" || ! is_within_root "${PLAN_DIR}"; then
printf '%s\n' 'Error: plan directory is outside the project or cannot be verified.' >&2
exit 1
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "planning-with-files",
"version": "3.20.0",
"version": "3.20.3",
"description": "Persistent project planning with selected context injection. Automatic recovery uses project files only; explicit catchup modes read same-project local session records for aggregate counts or bounded replay. The host-aware gate never runs Markdown-declared commands. No network upload path. Ships the skill plus a Pi Coding Agent extension.",
"keywords": [
"pi-package",
@@ -350,16 +350,23 @@ if ($Mode -ne "") {
# (c) auto-attest (attestation default-on in v3 modes, security strand rec 1).
# attest-plan.ps1 intentionally refuses non-Windows hosts because its secure
# no-follow implementation uses Win32 handles. On Unix, use the POSIX
# attester instead. Bind slug mode to the plan we just created so an
# inherited PLAN_ID cannot redirect attestation to another plan.
# attester instead. Slug mode binds PWF_PLAN_ROOT and PLAN_ID to the plan
# we just created so an inherited pin or slug cannot redirect attestation
# to another project or plan (#261, #237). Root mode clears both instead:
# the attester only falls back to the legacy ./task_plan.md when no
# selector is set, and a bound pin would make it refuse the root plan.
$PlanFilePwf = Join-Path $PlanDirPwf "task_plan.md"
if (Test-Path -LiteralPath $PlanFilePwf) {
$HadPlanId = Test-Path Env:PLAN_ID
$PreviousPlanId = $env:PLAN_ID
$HadPlanRoot = Test-Path Env:PWF_PLAN_ROOT
$PreviousPlanRoot = $env:PWF_PLAN_ROOT
try {
if ($UsePlanDir) {
$env:PWF_PLAN_ROOT = (Get-Location).Path
$env:PLAN_ID = $PlanId
} else {
Remove-Item Env:PWF_PLAN_ROOT -ErrorAction SilentlyContinue
Remove-Item Env:PLAN_ID -ErrorAction SilentlyContinue
}
@@ -384,6 +391,11 @@ if ($Mode -ne "") {
} else {
Remove-Item Env:PLAN_ID -ErrorAction SilentlyContinue
}
if ($HadPlanRoot) {
$env:PWF_PLAN_ROOT = $PreviousPlanRoot
} else {
Remove-Item Env:PWF_PLAN_ROOT -ErrorAction SilentlyContinue
}
}
}
@@ -103,6 +103,7 @@ slugify() {
# Lowercase, non-alphanumerics → '-', collapse repeats, trim leading/trailing '-'
printf '%s' "$1" \
| tr '[:upper:]' '[:lower:]' \
| tr '\r\n' '--' \
| sed -e 's/[^a-z0-9]/-/g' -e 's/-\{2,\}/-/g' -e 's/^-//' -e 's/-$//' \
| cut -c1-40
}
@@ -202,12 +203,20 @@ apply_v3_mode() {
# (c) auto-attest the plan (attestation default-on in v3 modes, security
# strand rec 1). attest-plan.sh resolves the same way init-session just
# pinned things: in slug mode PLAN_ID points at this plan dir; in legacy
# mode it is empty and the script falls back to ./task_plan.md at root.
# Run from the project root (CWD here) so both resolutions land.
# pinned things. Slug mode binds both selectors to the plan that was
# just created, so an inherited PWF_PLAN_ROOT or PLAN_ID cannot
# redirect attestation to another project or plan (#261, #237). Root
# mode clears both instead: the attester only falls back to the legacy
# ./task_plan.md when no selector is set, and a bound pin would make it
# refuse the root plan. Run from the project root (CWD here) so both
# resolutions land.
_attest="${SCRIPT_DIR}/attest-plan.sh"
if [ -f "${_attest}" ] && [ -f "${_mode_plan}" ]; then
PLAN_ID="${PLAN_ID:-}" sh "${_attest}" >/dev/null 2>&1 || true
if [ "$SLUG_MODE" -eq 1 ]; then
PWF_PLAN_ROOT="$PWD" PLAN_ID="${PLAN_ID}" sh "${_attest}" >/dev/null 2>&1 || true
else
PWF_PLAN_ROOT="" PLAN_ID="" sh "${_attest}" >/dev/null 2>&1 || true
fi
fi
}
@@ -845,7 +845,10 @@ class Injector(object):
)
raise Bail()
if plan_id:
if slug_is_valid(plan_id) and is_dir(plan_prefix + ".planning/" + plan_id):
# A linked plan directory is never selectable (#270): the same
# `[ ! -L ]` the reference applies on every branch below.
if (slug_is_valid(plan_id) and is_dir(plan_prefix + ".planning/" + plan_id)
and not is_link(plan_prefix + ".planning/" + plan_id)):
resolved = plan_prefix + ".planning/" + plan_id
scope = "scoped"
explicit = True
@@ -864,7 +867,7 @@ class Injector(object):
active = b""
if active and slug_is_valid(active):
slug = active.decode("ascii")
if is_dir(plan_prefix + ".planning/" + slug):
if is_dir(plan_prefix + ".planning/" + slug) and not is_link(plan_prefix + ".planning/" + slug):
resolved = plan_prefix + ".planning/" + slug
scope = "scoped"
if not resolved and is_dir(plan_prefix + ".planning"):
@@ -880,6 +883,8 @@ class Injector(object):
candidate = plan_prefix + ".planning/" + name
if not is_dir(candidate):
continue
if is_link(candidate):
continue
if not slug_is_valid(name):
continue
if not is_file(candidate + "/task_plan.md"):
@@ -1327,7 +1332,12 @@ def plan_is_ambiguous(plan_root, project_root, plan_id=""):
except OSError:
names = []
for name in names:
if slug_is_valid(name) and is_file(plan_root + "/" + name + "/task_plan.md"):
candidate_dir = plan_root + "/" + name
# A linked plan directory is not selectable, so it never counts (#270):
# the reference tests `[ -L "$plan_candidate_dir" ]` before `-f`.
if is_link(candidate_dir):
continue
if slug_is_valid(name) and is_file(candidate_dir + "/task_plan.md"):
count += 1
if count > 1:
return True
@@ -1364,7 +1374,7 @@ def resolve_plan_dir(env=None):
if plan_id:
if slug_is_valid(plan_id):
candidate = fs_root + "/" + plan_id
if is_dir(candidate) and within(candidate):
if is_dir(candidate) and not is_link(candidate) and within(candidate):
return found(plan_id)
return ("", "")
@@ -1382,7 +1392,7 @@ def resolve_plan_dir(env=None):
if slug_is_valid(active):
slug = active.decode("ascii")
candidate = fs_root + "/" + slug
if is_dir(candidate) and within(candidate):
if is_dir(candidate) and not is_link(candidate) and within(candidate):
return found(slug)
if is_dir(fs_root):
@@ -1398,6 +1408,8 @@ def resolve_plan_dir(env=None):
continue
if name.startswith("."):
continue
if is_link(candidate):
continue
if not slug_is_valid(name):
continue
if not is_file(candidate + "/task_plan.md"):
@@ -263,8 +263,9 @@ if [ -z "${PLAN_ID:-}" ]; then
PLAN_COUNT=1
fi
for plan_candidate in "${PLAN_PREFIX}".planning/*/task_plan.md; do
[ -f "$plan_candidate" ] || continue
plan_candidate_dir="${plan_candidate%/task_plan.md}"
[ -L "$plan_candidate_dir" ] && continue
[ -f "$plan_candidate" ] || continue
slug_is_valid "${plan_candidate_dir##*/}" || continue
PLAN_COUNT=$((PLAN_COUNT + 1))
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
@@ -295,7 +296,9 @@ if [ -n "${PLAN_ID:-}" ]; then
# 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
# A linked plan directory is never selectable (#270): same `-L` rule as
# the counter above and as resolve-plan-dir.sh, on every branch below.
if slug_is_valid "$PLAN_ID" && [ -d "${PLAN_PREFIX}.planning/${PLAN_ID}" ] && [ ! -L "${PLAN_PREFIX}.planning/${PLAN_ID}" ]; then
RESOLVED="${PLAN_PREFIX}.planning/${PLAN_ID}"; SCOPE="scoped"; EXPLICIT=1
else
if [ "$CONTEXT" = "userprompt" ]; then
@@ -305,7 +308,7 @@ if [ -n "${PLAN_ID:-}" ]; then
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
if [ -n "$AP" ] && slug_is_valid "$AP" && [ -d "${PLAN_PREFIX}.planning/${AP}" ] && [ ! -L "${PLAN_PREFIX}.planning/${AP}" ]; then
RESOLVED="${PLAN_PREFIX}.planning/${AP}"; SCOPE="scoped"
fi
fi
@@ -314,6 +317,7 @@ if [ -z "$RESOLVED" ] && [ -d "${PLAN_PREFIX}.planning" ]; then
for d in "${PLAN_PREFIX}".planning/*/; do
d="${d%/}"; n="${d##*/}"
case "$n" in .*) continue;; esac
[ -L "$d" ] && continue
slug_is_valid "$n" || continue
[ -f "$d/task_plan.md" ] || continue
m=$(stat -c '%Y' "$d" 2>/dev/null || stat -f '%m' "$d" 2>/dev/null || date -r "$d" +%s 2>/dev/null || echo 0)
@@ -139,6 +139,23 @@ function Test-WithinRoot {
return $candNorm.StartsWith($rootNorm + [System.IO.Path]::DirectorySeparatorChar, [System.StringComparison]::OrdinalIgnoreCase)
}
# A linked plan directory (symlink or junction) is never selectable: not by
# PLAN_ID, not by the pointer, not by the newest scan, and it never counts
# (#270). This is `[ -L ]` of resolve-plan-dir.sh and is_link of the Python
# twin: LinkType names symlinks and junctions only. The ReparsePoint
# attribute alone would also match OneDrive Files On-Demand placeholders,
# which every synced directory carries and which are not links to sh.
function Test-LinkedDirectory {
param($PathOrItem)
if ($PathOrItem -is [string]) {
$item = Get-Item -LiteralPath $PathOrItem -Force -ErrorAction SilentlyContinue
} else {
$item = $PathOrItem
}
if (-not $item) { return $false }
return ([string]$item.LinkType) -in @('SymbolicLink', 'Junction')
}
$activeFile = Join-Path $PlanRoot ".active_plan"
# A set PLAN_ID is a BINDING, not a hint (issue #237). A selector that names
@@ -158,6 +175,9 @@ if (-not $env:PLAN_ID) {
}
if (Test-Path -LiteralPath $PlanRoot -PathType Container) {
foreach ($entry in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue)) {
# A linked plan directory (symlink, junction) is not selectable and
# never counts, matching `[ -L ]` in resolve-plan-dir.sh (#270).
if (Test-LinkedDirectory $entry) { continue }
if ((Test-ValidSlug $entry.Name) -and
(Test-Path -LiteralPath (Join-Path $entry.FullName "task_plan.md") -PathType Leaf)) {
$planCount++
@@ -175,7 +195,7 @@ if ($planCount -gt 1) { exit 0 }
if ($env:PLAN_ID) {
if (Test-ValidSlug $env:PLAN_ID) {
$candidate = Join-Path $PlanRoot $env:PLAN_ID
if ((Test-Path -LiteralPath $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
if ((Test-Path -LiteralPath $candidate -PathType Container) -and -not (Test-LinkedDirectory $candidate) -and (Test-WithinRoot $candidate)) {
Write-Output $candidate
exit 0
}
@@ -198,7 +218,7 @@ if ($activeItem) {
$planId = "$(Get-Content -LiteralPath $activeFile -Raw -ErrorAction SilentlyContinue)".Trim()
if ($planId -and (Test-ValidSlug $planId)) {
$candidate = Join-Path $PlanRoot $planId
if ((Test-Path -LiteralPath $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
if ((Test-Path -LiteralPath $candidate -PathType Container) -and -not (Test-LinkedDirectory $candidate) -and (Test-WithinRoot $candidate)) {
Write-Output $candidate
exit 0
}
@@ -211,6 +231,7 @@ if ($activeItem) {
if (Test-Path -LiteralPath $PlanRoot -PathType Container) {
$latest = Get-ChildItem -LiteralPath $PlanRoot -Directory |
Where-Object { -not $_.Name.StartsWith('.') } |
Where-Object { -not (Test-LinkedDirectory $_) } |
Where-Object { Test-ValidSlug $_.Name } |
Where-Object { Test-Path -LiteralPath (Join-Path $_.FullName "task_plan.md") -PathType Leaf } |
Where-Object { Test-WithinRoot $_.FullName } |

Some files were not shown because too many files have changed in this diff Show More