Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f12e714e3f | ||
|
|
7f8b6da3b2 | ||
|
|
7297d964eb | ||
|
|
8379610e83 | ||
|
|
7c11cb7570 | ||
|
|
e7d8be14f4 | ||
|
|
6834e65f0b | ||
|
|
8699bc573c | ||
|
|
10d4a585a9 | ||
|
|
ae7e3ae817 | ||
|
|
6317beb930 | ||
|
|
1ec8f4eb5c | ||
|
|
b19fa8e8d9 | ||
|
|
716318a827 | ||
|
|
f67e2bb729 | ||
|
|
a718f05689 | ||
|
|
3cbb7dcc4b | ||
|
|
e8ad1534ed | ||
|
|
5046267994 | ||
|
|
ecaf63f689 |
@@ -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.17.0"
|
||||
version: "3.18.2"
|
||||
---
|
||||
|
||||
# Planning with Files
|
||||
@@ -40,7 +40,7 @@ Work like Manus: Use persistent markdown files as your "working memory on disk."
|
||||
**Before continuing**, resolve the plan this task owns:
|
||||
|
||||
1. Use the installed `scripts/resolve-plan-dir.sh` (or `.ps1`) with the task's `PLAN_ID` and `PWF_PLAN_ROOT`. Read `task_plan.md`, `progress.md`, and `findings.md` from that one selected directory. A root `task_plan.md` must not override a selected `.planning/<id>/` plan.
|
||||
2. If an explicit selector is rejected, or session isolation is armed with multiple plans and no `PLAN_ID`, stop plan recovery and correct the pin. Do not fall back to another task. Use the legacy project-root files only when no selector or named plan applies.
|
||||
2. If an explicit selector is rejected, or multiple named plans exist without `PLAN_ID`, stop plan recovery and correct the pin. Do not fall back to another task. Use the legacy project-root files only when no selector or named plan applies.
|
||||
3. Run `git diff --stat` to see code changes that may not yet be recorded in the planning files.
|
||||
|
||||
All planning filenames below refer to this selected directory, even when the shell runs elsewhere. For parallel tasks, pin each host before starting it or use separate worktrees. A worker joining an existing task uses its assigned plan; it must not create or overwrite a competing root plan.
|
||||
@@ -221,12 +221,18 @@ Helper scripts for automation:
|
||||
|
||||
- `scripts/init-session.sh` — Initialize planning files. With a name arg, creates an isolated plan under `.planning/YYYY-MM-DD-<slug>/` for parallel task workflows. Without args, writes `task_plan.md` at project root (legacy mode, backward-compatible).
|
||||
- `scripts/set-active-plan.sh` — Switch the active plan pointer (`.planning/.active_plan`). Run with a plan ID to switch; run without args to show which plan is current.
|
||||
- `scripts/resolve-plan-dir.sh` — Resolve the active plan directory. A set `$PLAN_ID` is a binding: it resolves or resolution stops, never another plan (issue #237). With no `$PLAN_ID`, checks `.planning/.active_plan`, then newest plan dir by mtime, then falls back to project root (legacy). Used internally by hooks.
|
||||
- `scripts/resolve-plan-dir.sh` — Resolve the active plan directory. A set `$PLAN_ID` is a binding: it resolves or resolution stops, never another plan (issue #237). With no `$PLAN_ID`, multiple named plans refuse selection. A single named plan may use `.planning/.active_plan` or discovery by mtime; otherwise resolution falls back to the project root (legacy). Used internally by hooks.
|
||||
- `scripts/check-complete.sh` — Verify all phases in the active plan are complete.
|
||||
- `scripts/session-catchup.py`: Explicit same-project session-record aggregation or bounded replay (`--metadata` / `--replay`); bare invocation does not access host history.
|
||||
- `scripts/attest-plan.sh` (and `.ps1`) — Lock the current `task_plan.md` content with a SHA-256 attestation (v2.37.0). Hooks then refuse to inject plan content if the file diverges from the attested hash. Use `--show` to print the stored hash, `--clear` to remove the attestation. See `/plan-attest` command.
|
||||
- `scripts/plan-doctor.sh` — One-pass self-check for the mechanisms that fail silently (v3.6.0): plan resolution, hook injection, canonicalizer path shape, attestation state, install surfaces, per-fire hook latency. Run it whenever hooks seem quiet or after installing on a new machine. See `/plan-doctor` command.
|
||||
|
||||
### List saved plans
|
||||
|
||||
To find a task before resuming it, run `sh "<skill-dir>/scripts/set-active-plan.sh" --list` or, in Windows PowerShell, `& "<skill-dir>/scripts/set-active-plan.ps1" -List`. Replace `<skill-dir>` with this installed skill directory and keep your current directory at the project root.
|
||||
|
||||
This read-only command lists named plans and phase progress under the current directory's `.planning/`. `[active]` marks the shared default pointer; it does not bind a session. Concurrent tasks still require each host's `PLAN_ID` or separate worktrees.
|
||||
|
||||
### Parallel task workflow
|
||||
|
||||
For independent tasks in the same repository, create a named plan for each and pin each agent host to its own plan:
|
||||
|
||||
@@ -404,6 +404,7 @@ function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
$resolvedDir = @(& $resolver | Where-Object { $_ }) | Select-Object -First 1
|
||||
if (-not $resolvedDir -and ((& $resolver -CheckAmbiguity) -eq "PWF_PLAN_AMBIGUOUS_V1")) { return $null }
|
||||
if ($resolvedDir) {
|
||||
$planFile = Join-Path $resolvedDir "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $planFile -ExpectedDirectory $resolvedDir)
|
||||
|
||||
@@ -45,6 +45,10 @@ resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
plan_dir="$(sh "${RESOLVER}" 2>/dev/null)"
|
||||
if [ -z "$plan_dir" ] && [ "$(sh "${RESOLVER}" --check-ambiguity 2>/dev/null)" = "PWF_PLAN_AMBIGUOUS_V1" ]; then
|
||||
printf "[plan-attest] Multiple plans are available. Set PLAN_ID=<slug>; nothing was attested.\n" >&2
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
if [ -n "${plan_dir}" ] && [ -f "${plan_dir}/task_plan.md" ]; then
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
|
||||
@@ -35,6 +35,7 @@ if ($PlanFile -ne "") {
|
||||
try {
|
||||
$resolvedDir = (& $resolver 2>$null | Select-Object -First 1)
|
||||
if ($null -eq $resolvedDir) { $resolvedDir = "" }
|
||||
if (-not $resolvedDir -and ((& $resolver -CheckAmbiguity) -eq "PWF_PLAN_AMBIGUOUS_V1")) { exit 0 }
|
||||
} catch {
|
||||
$resolvedDir = ""
|
||||
}
|
||||
|
||||
@@ -56,6 +56,9 @@ else
|
||||
RESOLVED_DIR=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
RESOLVED_DIR="$(sh "${RESOLVER}" 2>/dev/null)"
|
||||
if [ -z "$RESOLVED_DIR" ] && [ "$(sh "${RESOLVER}" --check-ambiguity 2>/dev/null)" = "PWF_PLAN_AMBIGUOUS_V1" ]; then
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
if [ -n "${RESOLVED_DIR}" ] && [ -f "${RESOLVED_DIR}/task_plan.md" ]; then
|
||||
PLAN_FILE="${RESOLVED_DIR}/task_plan.md"
|
||||
|
||||
@@ -59,12 +59,9 @@ Windows runs the shell chain through Git Bash and nothing else:
|
||||
one turn-marker slot and one progress-guard slot per plan.
|
||||
|
||||
Known, accepted differences from the shell reference:
|
||||
* Two plan directories with the same whole-second mtime, no .active_plan
|
||||
and no PLAN_ID: the reference picks the first in the shell's glob order
|
||||
(locale collation), this twin the first in code-point order. The same
|
||||
collation difference can change which three of four or more nested
|
||||
projects the ambiguity notice names. A machine runs one implementation,
|
||||
so neither choice flips within a session.
|
||||
* Shell glob order follows locale collation; this twin uses code-point
|
||||
order. This can change which three of four or more nested projects the
|
||||
ambiguity notice names.
|
||||
* BSD sed (macOS) appends a newline to a progress.md whose last line has
|
||||
none; GNU sed and this twin do not.
|
||||
* With PWF_PLAN_ROOT set under Git Bash the shell sees the pin as typed
|
||||
@@ -837,6 +834,16 @@ class Injector(object):
|
||||
scope = ""
|
||||
explicit = bool(plan_prefix)
|
||||
plan_id = env.get("PLAN_ID", "")
|
||||
ambiguous = plan_is_ambiguous(
|
||||
plan_prefix + ".planning", plan_root_pin if plan_root_pin else ".", plan_id
|
||||
)
|
||||
if ambiguous and (context == "preflight" or not is_dir(plan_prefix + ".planning/sessions")):
|
||||
if context == "userprompt":
|
||||
self.echo(
|
||||
"[planning-with-files] Multiple plans are available. Set PLAN_ID=<slug> "
|
||||
"for this session; nothing injected."
|
||||
)
|
||||
raise Bail()
|
||||
if plan_id:
|
||||
if slug_is_valid(plan_id) and is_dir(plan_prefix + ".planning/" + plan_id):
|
||||
resolved = plan_prefix + ".planning/" + plan_id
|
||||
@@ -923,30 +930,14 @@ class Injector(object):
|
||||
"single-session mode."
|
||||
)
|
||||
raise Bail()
|
||||
if not plan_id:
|
||||
plan_n = 1 if is_file(plan_prefix + "task_plan.md") else 0
|
||||
try:
|
||||
names = sorted(os.listdir(plan_prefix + ".planning"))
|
||||
except OSError:
|
||||
names = []
|
||||
for name in names:
|
||||
if name.startswith("."):
|
||||
continue
|
||||
if not is_file(plan_prefix + ".planning/" + name + "/task_plan.md"):
|
||||
continue
|
||||
if not slug_is_valid(name):
|
||||
continue
|
||||
plan_n += 1
|
||||
if plan_n > 1:
|
||||
break
|
||||
if plan_n > 1:
|
||||
if context == "userprompt":
|
||||
self.echo(
|
||||
"[planning-with-files] Multiple plans are available while session "
|
||||
"isolation is armed. Set PLAN_ID=<slug> for this session; nothing "
|
||||
"injected."
|
||||
)
|
||||
raise Bail()
|
||||
if ambiguous:
|
||||
if context == "userprompt":
|
||||
self.echo(
|
||||
"[planning-with-files] Multiple plans are available while session "
|
||||
"isolation is armed. Set PLAN_ID=<slug> for this session; nothing "
|
||||
"injected."
|
||||
)
|
||||
raise Bail()
|
||||
|
||||
if not explicit:
|
||||
nested = []
|
||||
@@ -1326,6 +1317,23 @@ def inject(context, env=None):
|
||||
# Twin of resolve-plan-dir.sh (the shared resolver the dispatcher uses).
|
||||
# --------------------------------------------------------------------------
|
||||
|
||||
def plan_is_ambiguous(plan_root, project_root, plan_id=""):
|
||||
"""A project pointer or mtime cannot bind a session to multiple plans."""
|
||||
if plan_id:
|
||||
return False
|
||||
count = 1 if is_dir(plan_root + "/sessions") and is_file(project_root + "/task_plan.md") else 0
|
||||
try:
|
||||
names = os.listdir(plan_root)
|
||||
except OSError:
|
||||
names = []
|
||||
for name in names:
|
||||
if slug_is_valid(name) and is_file(plan_root + "/" + name + "/task_plan.md"):
|
||||
count += 1
|
||||
if count > 1:
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
def resolve_plan_dir(env=None):
|
||||
"""Return (spelled, filesystem) paths of the plan directory, or ("", "").
|
||||
|
||||
@@ -1360,6 +1368,9 @@ def resolve_plan_dir(env=None):
|
||||
return found(plan_id)
|
||||
return ("", "")
|
||||
|
||||
if plan_is_ambiguous(fs_root, pin if pin else "."):
|
||||
return ("", "")
|
||||
|
||||
active_file = fs_root + "/.active_plan"
|
||||
if is_file(active_file):
|
||||
try:
|
||||
@@ -1441,6 +1452,8 @@ class ClaudeDispatcher(object):
|
||||
return (spelled, fs)
|
||||
if self.env.get("PLAN_ID", "") or self.env.get("PWF_PLAN_ROOT", ""):
|
||||
return ("", "")
|
||||
if plan_is_ambiguous(".planning", "."):
|
||||
return ("", "")
|
||||
if is_file("task_plan.md"):
|
||||
return (".", ".")
|
||||
return ("", "")
|
||||
|
||||
@@ -254,6 +254,29 @@ is_within_root() {
|
||||
# The .active_plan pointer, the newest-by-mtime fallback, and the legacy root
|
||||
# task_plan.md are cwd GUESSES — only guesses are subject to the nested-root
|
||||
# conflict check below.
|
||||
# Shared .active_plan and directory mtime cannot identify this session's plan.
|
||||
# Check before selection or preflight, even when isolation was never armed.
|
||||
PLAN_AMBIGUOUS=0
|
||||
if [ -z "${PLAN_ID:-}" ]; then
|
||||
PLAN_COUNT=0
|
||||
if [ -d "${PLAN_PREFIX}.planning/sessions" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; 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}"
|
||||
slug_is_valid "${plan_candidate_dir##*/}" || continue
|
||||
PLAN_COUNT=$((PLAN_COUNT + 1))
|
||||
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
|
||||
done
|
||||
fi
|
||||
if [ "$PLAN_AMBIGUOUS" = "1" ] && { [ "$CONTEXT" = "preflight" ] || [ ! -d "${PLAN_PREFIX}.planning/sessions" ]; }; then
|
||||
if [ "$CONTEXT" = "userprompt" ]; then
|
||||
echo "[planning-with-files] Multiple plans are available. Set PLAN_ID=<slug> for this session; nothing injected."
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
|
||||
RESOLVED=""
|
||||
SCOPE=""
|
||||
EXPLICIT=0
|
||||
@@ -442,27 +465,13 @@ PY
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# An attachment admits a session but does not select one of several plans.
|
||||
# When isolation is armed, require PLAN_ID if more than one live same-root
|
||||
# candidate exists. PWF_PLAN_ROOT selects the project root, not a plan
|
||||
# within that root.
|
||||
if [ -z "${PLAN_ID:-}" ]; then
|
||||
SESSION_PLAN_N=0
|
||||
[ -f "${PLAN_PREFIX}task_plan.md" ] && SESSION_PLAN_N=1
|
||||
for candidate in "${PLAN_PREFIX}".planning/*/task_plan.md; do
|
||||
[ -f "$candidate" ] || continue
|
||||
candidate_dir="${candidate%/task_plan.md}"
|
||||
candidate_slug="${candidate_dir##*/}"
|
||||
slug_is_valid "$candidate_slug" || continue
|
||||
SESSION_PLAN_N=$((SESSION_PLAN_N + 1))
|
||||
[ "$SESSION_PLAN_N" -gt 1 ] && break
|
||||
done
|
||||
if [ "$SESSION_PLAN_N" -gt 1 ]; then
|
||||
if [ "$CONTEXT" = "userprompt" ]; then
|
||||
echo "[planning-with-files] Multiple plans are available while session isolation is armed. Set PLAN_ID=<slug> for this session; nothing injected."
|
||||
fi
|
||||
exit 0
|
||||
# Attachment admits a session but does not select its plan. Preserve the
|
||||
# attachment-first notice above for sessions that never opted in.
|
||||
if [ "$PLAN_AMBIGUOUS" = "1" ]; then
|
||||
if [ "$CONTEXT" = "userprompt" ]; then
|
||||
echo "[planning-with-files] Multiple plans are available while session isolation is armed. Set PLAN_ID=<slug> for this session; nothing injected."
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@@ -13,7 +13,8 @@
|
||||
# junction/symlink escape; slug validation alone blocks textual traversal.
|
||||
|
||||
param(
|
||||
[string]$PlanRoot = (Join-Path (Get-Location) ".planning")
|
||||
[string]$PlanRoot = (Join-Path (Get-Location) ".planning"),
|
||||
[switch]$CheckAmbiguity
|
||||
)
|
||||
|
||||
$projectRoot = (Get-Location).Path
|
||||
@@ -137,6 +138,30 @@ $activeFile = Join-Path $PlanRoot ".active_plan"
|
||||
# at rc=0. Emptiness is the fail-closed signal on this channel, matching
|
||||
# resolve-plan-dir.sh and the PWF_PLAN_ROOT pin. An empty $env:PLAN_ID is
|
||||
# falsy here and still means "unset".
|
||||
# The optional probe distinguishes ambiguity from a legacy-root fallback.
|
||||
# Multiple named plans require PLAN_ID even without a sessions directory.
|
||||
$planCount = 0
|
||||
if (-not $env:PLAN_ID) {
|
||||
if ((Test-Path -LiteralPath (Join-Path $PlanRoot "sessions") -PathType Container) -and
|
||||
(Test-Path -LiteralPath (Join-Path $projectRoot "task_plan.md") -PathType Leaf)) {
|
||||
$planCount = 1
|
||||
}
|
||||
if (Test-Path -LiteralPath $PlanRoot -PathType Container) {
|
||||
foreach ($entry in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue)) {
|
||||
if ((Test-ValidSlug $entry.Name) -and
|
||||
(Test-Path -LiteralPath (Join-Path $entry.FullName "task_plan.md") -PathType Leaf)) {
|
||||
$planCount++
|
||||
if ($planCount -gt 1) { break }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($CheckAmbiguity) {
|
||||
if ($planCount -gt 1) { Write-Output "PWF_PLAN_AMBIGUOUS_V1" }
|
||||
exit 0
|
||||
}
|
||||
if ($planCount -gt 1) { exit 0 }
|
||||
|
||||
if ($env:PLAN_ID) {
|
||||
if (Test-ValidSlug $env:PLAN_ID) {
|
||||
$candidate = Join-Path $PlanRoot $env:PLAN_ID
|
||||
|
||||
@@ -15,6 +15,13 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Optional probe distinguishes ambiguity from the empty legacy-root result.
|
||||
# Both modes keep stdout data-only and always exit zero.
|
||||
CHECK_AMBIGUITY=0
|
||||
if [ "${1:-}" = "--check-ambiguity" ]; then
|
||||
CHECK_AMBIGUITY=1
|
||||
shift
|
||||
fi
|
||||
PLAN_ROOT="${1:-${PWD}/.planning}"
|
||||
|
||||
# --- PWF_PLAN_ROOT: absolute plan-root binding (issue #212). ---
|
||||
@@ -321,6 +328,29 @@ resolve_latest_dir() {
|
||||
# the fail-closed signal on this channel, exactly as the PWF_PLAN_ROOT guard
|
||||
# above already does it; a non-zero status would kill callers running under
|
||||
# set -e for a condition that is not an internal error.
|
||||
# A shared pointer or mtime is not a per-session binding (issue #240).
|
||||
# Count conservatively, just like injection: slug-valid live plan files.
|
||||
# The legacy root joins the count only when session isolation is armed.
|
||||
PLAN_AMBIGUOUS=0
|
||||
if [ -z "${PLAN_ID:-}" ]; then
|
||||
PLAN_COUNT=0
|
||||
if [ -d "${PLAN_ROOT}/sessions" ] && [ -f "${PWF_ROOT_PIN:-.}/task_plan.md" ]; 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}"
|
||||
slug_is_valid "${plan_candidate_dir##*/}" || continue
|
||||
PLAN_COUNT=$((PLAN_COUNT + 1))
|
||||
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
|
||||
done
|
||||
fi
|
||||
if [ "$CHECK_AMBIGUITY" = "1" ]; then
|
||||
[ "$PLAN_AMBIGUOUS" = "1" ] && printf '%s\n' 'PWF_PLAN_AMBIGUOUS_V1'
|
||||
exit 0
|
||||
fi
|
||||
[ "$PLAN_AMBIGUOUS" = "1" ] && exit 0
|
||||
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
resolve_from_env && exit 0
|
||||
exit 0
|
||||
|
||||
Regular → Executable
+266
-16
@@ -1,27 +1,245 @@
|
||||
# planning-with-files: set or display the active plan pointer (PowerShell).
|
||||
# planning-with-files: set, display, or list the active plan pointer (PowerShell).
|
||||
#
|
||||
# Usage:
|
||||
# .\set-active-plan.ps1 <plan_id> - pin .planning\.active_plan to plan_id
|
||||
# .\set-active-plan.ps1 - print the current active plan (if any)
|
||||
# .\set-active-plan.ps1 -List - list available named plans and phase counts
|
||||
# .\set-active-plan.ps1 --list - equivalent to -List and -l
|
||||
|
||||
param(
|
||||
[string]$PlanId = ""
|
||||
[Parameter(Position = 0)]
|
||||
[string]$PlanId = "",
|
||||
[Alias('l', '-list')]
|
||||
[switch]$List,
|
||||
[Alias('h', '-help')]
|
||||
[switch]$Help
|
||||
)
|
||||
|
||||
$PlanRoot = Join-Path (Get-Location) ".planning"
|
||||
$ProjectRoot = (Get-Location).Path
|
||||
# Windows PowerShell 5.1 can silently change directories when -File inherits
|
||||
# a cwd containing wildcard characters. Recover that physical cwd only for a
|
||||
# direct invocation of this script; interactive Set-Location remains primary.
|
||||
if ($PSVersionTable.PSVersion.Major -eq 5 -and
|
||||
[System.Management.Automation.WildcardPattern]::ContainsWildcardCharacters([Environment]::CurrentDirectory)) {
|
||||
$processArgs = [Environment]::GetCommandLineArgs()
|
||||
for ($index = 0; $index -lt ($processArgs.Length - 1); $index++) {
|
||||
if ($processArgs[$index] -ieq '-File') {
|
||||
$entryScript = $processArgs[$index + 1]
|
||||
if (-not [IO.Path]::IsPathRooted($entryScript)) {
|
||||
$entryScript = Join-Path ([Environment]::CurrentDirectory) $entryScript
|
||||
}
|
||||
if ([IO.Path]::GetFullPath($entryScript) -eq [IO.Path]::GetFullPath($PSCommandPath)) {
|
||||
$ProjectRoot = [Environment]::CurrentDirectory
|
||||
}
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
$PlanRoot = Join-Path $ProjectRoot ".planning"
|
||||
$ActiveFile = Join-Path $PlanRoot ".active_plan"
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
|
||||
# Resolve-Path can retain a junction's spelling. Like resolve-plan-dir.ps1,
|
||||
# open the actual filesystem object before checking the project boundary.
|
||||
# The Windows handle supports both directories and task_plan.md files.
|
||||
function Get-FinalPath {
|
||||
param([string]$Path)
|
||||
if (-not ("PwfPlanListingNative" -as [type])) {
|
||||
Add-Type -ErrorAction Stop -TypeDefinition @'
|
||||
using System;
|
||||
using System.ComponentModel;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
using Microsoft.Win32.SafeHandles;
|
||||
|
||||
public static class PwfPlanListingNative {
|
||||
[DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
|
||||
private static extern SafeFileHandle CreateFileW(
|
||||
string name, uint access, uint share, IntPtr security,
|
||||
uint creation, uint flags, IntPtr template);
|
||||
[DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
|
||||
private static extern uint GetFinalPathNameByHandleW(
|
||||
SafeFileHandle handle, StringBuilder path, uint length, uint flags);
|
||||
[DllImport("libc", SetLastError = true)]
|
||||
private static extern IntPtr realpath(string path, IntPtr resolved);
|
||||
[DllImport("libc")]
|
||||
private static extern void free(IntPtr pointer);
|
||||
|
||||
public static string FinalPath(string path) {
|
||||
if (Environment.OSVersion.Platform != PlatformID.Win32NT) {
|
||||
IntPtr resolved = realpath(path, IntPtr.Zero);
|
||||
if (resolved == IntPtr.Zero) throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
try { return Marshal.PtrToStringAnsi(resolved); }
|
||||
finally { free(resolved); }
|
||||
}
|
||||
// OPEN_EXISTING, FILE_SHARE_READ | WRITE | DELETE, BACKUP_SEMANTICS.
|
||||
using (SafeFileHandle handle = CreateFileW(
|
||||
path, 0, 7, IntPtr.Zero, 3, 0x02000000, IntPtr.Zero)) {
|
||||
if (handle.IsInvalid) throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
StringBuilder buffer = new StringBuilder(32768);
|
||||
uint length = GetFinalPathNameByHandleW(handle, buffer, (uint)buffer.Capacity, 0);
|
||||
if (length == 0 || length >= buffer.Capacity)
|
||||
throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
string result = buffer.ToString();
|
||||
if (result.StartsWith(@"\\?\UNC\", StringComparison.OrdinalIgnoreCase))
|
||||
return @"\\" + result.Substring(8);
|
||||
if (result.StartsWith(@"\\?\", StringComparison.OrdinalIgnoreCase))
|
||||
return result.Substring(4);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
'@
|
||||
}
|
||||
return [PwfPlanListingNative]::FinalPath($Path)
|
||||
}
|
||||
|
||||
function Test-WithinRoot {
|
||||
param([string]$Path)
|
||||
try {
|
||||
$rootReal = (Get-FinalPath $ProjectRoot).TrimEnd('\', '/')
|
||||
$pathReal = (Get-FinalPath $Path).TrimEnd('\', '/')
|
||||
$comparison = [StringComparison]::Ordinal
|
||||
if ($script:IsWindowsHost) { $comparison = [StringComparison]::OrdinalIgnoreCase }
|
||||
return $pathReal.Equals($rootReal, $comparison) -or
|
||||
$pathReal.StartsWith($rootReal + [IO.Path]::DirectorySeparatorChar, $comparison)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
}
|
||||
|
||||
function Test-ValidSlug {
|
||||
param([string]$Name)
|
||||
return $Name -cmatch '^[A-Za-z0-9_][A-Za-z0-9._-]*\z'
|
||||
}
|
||||
|
||||
function Test-SafeActiveFile {
|
||||
param([switch]$AllowLink)
|
||||
$item = Get-Item -LiteralPath $ActiveFile -Force -ErrorAction SilentlyContinue
|
||||
if (-not $item) { return $false }
|
||||
# Reading may follow a verified in-project link; writing must not.
|
||||
return -not $item.PSIsContainer -and
|
||||
($AllowLink -or (($item.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) -and
|
||||
(Test-WithinRoot $ActiveFile)
|
||||
}
|
||||
|
||||
function Get-CurrentActivePlan {
|
||||
if (-not (Test-SafeActiveFile -AllowLink)) { return "" }
|
||||
try {
|
||||
$current = ([string](Get-Content -LiteralPath $ActiveFile -Raw -Encoding UTF8 -ErrorAction Stop)).Trim([char[]]"`r`n")
|
||||
if (Test-ValidSlug $current) { return $current }
|
||||
} catch { }
|
||||
return ""
|
||||
}
|
||||
|
||||
function Add-PhaseStatus {
|
||||
param([hashtable]$Counts, $Phase)
|
||||
if ($null -eq $Phase) { return }
|
||||
$status = $Phase.Inline
|
||||
if ($Phase.Primary) { $status = $Phase.Primary }
|
||||
if ($status) { $Counts[$status]++ }
|
||||
}
|
||||
|
||||
function Get-PhaseStatus {
|
||||
param([string]$PlanFile)
|
||||
$counts = @{ total = 0; complete = 0; in_progress = 0; pending = 0 }
|
||||
$phase = $null
|
||||
$fence = ""
|
||||
$fenceLength = 0
|
||||
# The shipped translations keep status identifiers in English. Unicode
|
||||
# escapes preserve Windows PowerShell 5.1 compatibility without a BOM.
|
||||
$phaseLabel = '(?:Phase|Fase|\u0627\u0644\u0645\u0631\u062d\u0644\u0629|\u9636\u6bb5|\u968e\u6bb5)'
|
||||
$statusLabel = '(?:Status:|Estado:|\u0627\u0644\u062d\u0627\u0644\u0629:|\u72b6\u6001\uff1a|\u72c0\u614b\uff1a)'
|
||||
# Read once; an empty file is a valid plan with zero phases.
|
||||
$content = [string](Get-Content -LiteralPath $PlanFile -Raw -Encoding UTF8 -ErrorAction Stop)
|
||||
foreach ($line in ($content -split '\r?\n')) {
|
||||
if ($fence) {
|
||||
$closing = '^ {0,3}' + [regex]::Escape($fence) + '{' + $fenceLength + ',}[ \t]*$'
|
||||
if ($line -match $closing) { $fence = "" }
|
||||
continue
|
||||
}
|
||||
if ($line -match '^ {0,3}(`{3,}|~{3,})') {
|
||||
$fence = $Matches[1].Substring(0, 1)
|
||||
$fenceLength = $Matches[1].Length
|
||||
continue
|
||||
}
|
||||
if ($line -cmatch ('^ {0,3}###[ \t]+' + $phaseLabel + '[ \t]+[0-9]+(?:[^0-9A-Za-z_]|$)')) {
|
||||
Add-PhaseStatus $counts $phase
|
||||
$phase = @{ Primary = ""; Inline = "" }
|
||||
$counts.total++
|
||||
if ($line -cmatch '\[(complete|in_progress|pending)\]') {
|
||||
$phase.Inline = $Matches[1]
|
||||
}
|
||||
continue
|
||||
}
|
||||
if ($line -match '^ {0,3}#{1,3}(?:[ \t]+|$)') {
|
||||
Add-PhaseStatus $counts $phase
|
||||
$phase = $null
|
||||
continue
|
||||
}
|
||||
if ($null -ne $phase -and -not $phase.Primary -and
|
||||
$line -cmatch ('^ {0,3}(?:-[ \t]+)?\*\*' + $statusLabel + '\*\*[ \t]+(complete|in_progress|pending)(?:[ \t]|$)')) {
|
||||
$phase.Primary = $Matches[1]
|
||||
}
|
||||
}
|
||||
Add-PhaseStatus $counts $phase
|
||||
return "$($counts.complete)/$($counts.total) complete, $($counts.in_progress) in_progress, $($counts.pending) pending"
|
||||
}
|
||||
|
||||
function Show-PlanList {
|
||||
if (-not (Test-Path -LiteralPath $PlanRoot -PathType Container)) {
|
||||
Write-Output "No planning directory found."
|
||||
return
|
||||
}
|
||||
if (-not (Test-WithinRoot $PlanRoot)) {
|
||||
Write-Error "Error: planning directory is outside the project or cannot be verified."
|
||||
exit 1
|
||||
}
|
||||
$active = Get-CurrentActivePlan
|
||||
Write-Output "Available plans:"
|
||||
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)) {
|
||||
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 }
|
||||
try { $status = Get-PhaseStatus $planFile } catch { continue }
|
||||
$marker = ""
|
||||
if ($plan.Name -ceq $active) { $marker = " [active]" }
|
||||
Write-Output "- $($plan.Name)$marker - $status"
|
||||
$found = $true
|
||||
}
|
||||
if (-not $found) { Write-Output "No named plans found." }
|
||||
}
|
||||
|
||||
if ($Help -or $PlanId -eq "--help" -or $PlanId -eq "-h") {
|
||||
Write-Output "Usage: set-active-plan.ps1 [-List|-l|--list|PLAN_ID]"
|
||||
exit 0
|
||||
}
|
||||
|
||||
if ($List -or $PlanId -eq "--list" -or $PlanId -eq "-l") {
|
||||
if ($List -and $PlanId) {
|
||||
Write-Error "Error: list plans or set PLAN_ID in separate calls."
|
||||
exit 1
|
||||
}
|
||||
Show-PlanList
|
||||
exit 0
|
||||
}
|
||||
|
||||
if ($PlanId -eq "") {
|
||||
if (Test-Path $ActiveFile) {
|
||||
$current = (Get-Content $ActiveFile -Raw -Encoding UTF8).Trim()
|
||||
$current = ""
|
||||
if ((Test-Path -LiteralPath $PlanRoot -PathType Container) -and -not (Test-WithinRoot $PlanRoot)) {
|
||||
Write-Error "Error: planning directory is outside the project or cannot be verified."
|
||||
exit 1
|
||||
}
|
||||
if (Test-WithinRoot $PlanRoot) { $current = Get-CurrentActivePlan }
|
||||
if ($current) {
|
||||
$planDir = Join-Path $PlanRoot $current
|
||||
if ($current -ne "" -and (Test-Path $planDir)) {
|
||||
if ((Test-Path -LiteralPath $planDir -PathType Container) -and (Test-WithinRoot $planDir)) {
|
||||
Write-Output "Active plan: $current"
|
||||
Write-Output "Path: $planDir"
|
||||
} elseif ($current -ne "") {
|
||||
Write-Output "Active plan pointer: $current (directory not found - stale pointer)"
|
||||
} else {
|
||||
Write-Output "No active plan set."
|
||||
Write-Output "Active plan pointer: $current (directory not found or outside project - stale pointer)"
|
||||
}
|
||||
} else {
|
||||
Write-Output "No active plan set."
|
||||
@@ -29,21 +247,53 @@ if ($PlanId -eq "") {
|
||||
exit 0
|
||||
}
|
||||
|
||||
if (-not (Test-ValidSlug $PlanId)) {
|
||||
Write-Error "Error: invalid plan ID. Use letters, numbers, underscores, dots, or hyphens; start with a letter, number, or underscore."
|
||||
exit 1
|
||||
}
|
||||
$PlanDir = Join-Path $PlanRoot $PlanId
|
||||
|
||||
if (-not (Test-Path $PlanDir)) {
|
||||
if (-not (Test-Path -LiteralPath $PlanDir -PathType Container)) {
|
||||
Write-Error "Error: plan directory not found: $PlanDir"
|
||||
Write-Error "Run: init-session.sh `"$PlanId`" to create it, or check .planning\ for available plans."
|
||||
exit 1
|
||||
}
|
||||
|
||||
if (-not (Test-Path $PlanRoot)) {
|
||||
New-Item -ItemType Directory -Path $PlanRoot -Force | Out-Null
|
||||
if (-not (Test-WithinRoot $PlanRoot) -or -not (Test-WithinRoot $PlanDir)) {
|
||||
Write-Error "Error: plan directory must remain within the project."
|
||||
exit 1
|
||||
}
|
||||
$activeItem = Get-Item -LiteralPath $ActiveFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not (Test-SafeActiveFile)) {
|
||||
Write-Error "Error: the active plan pointer must be a regular file within the project."
|
||||
exit 1
|
||||
}
|
||||
|
||||
$utf8NoBom = New-Object System.Text.UTF8Encoding($false)
|
||||
[System.IO.File]::WriteAllText($ActiveFile, $PlanId, $utf8NoBom)
|
||||
|
||||
# Replace the directory entry instead of truncating an existing inode: a
|
||||
# hardlinked pointer must not overwrite another file. The exclusive temporary
|
||||
# file lives beside the pointer, keeping replacement on the same filesystem.
|
||||
$tempFile = Join-Path $PlanRoot ('.active_plan.' + [guid]::NewGuid().ToString('N') + '.tmp')
|
||||
$createdTemp = $false
|
||||
try {
|
||||
$stream = [IO.File]::Open($tempFile, [IO.FileMode]::CreateNew, [IO.FileAccess]::Write, [IO.FileShare]::None)
|
||||
$createdTemp = $true
|
||||
try {
|
||||
$bytes = $utf8NoBom.GetBytes($PlanId)
|
||||
$stream.Write($bytes, 0, $bytes.Length)
|
||||
$stream.Flush()
|
||||
} finally { $stream.Dispose() }
|
||||
if ($activeItem) {
|
||||
[IO.File]::Replace($tempFile, $ActiveFile, [NullString]::Value)
|
||||
} else {
|
||||
[IO.File]::Move($tempFile, $ActiveFile)
|
||||
}
|
||||
} catch {
|
||||
Write-Error "Error: could not set the active plan pointer: $($_.Exception.Message)"
|
||||
exit 1
|
||||
} finally {
|
||||
if ($createdTemp -and (Test-Path -LiteralPath $tempFile)) {
|
||||
Remove-Item -LiteralPath $tempFile -Force -ErrorAction SilentlyContinue
|
||||
}
|
||||
}
|
||||
Write-Output "Active plan set to: $PlanId"
|
||||
Write-Output "Path: $PlanDir"
|
||||
Write-Output ""
|
||||
|
||||
Regular → Executable
+323
-38
@@ -1,50 +1,335 @@
|
||||
#!/bin/sh
|
||||
# planning-with-files: set or display the active plan pointer.
|
||||
#
|
||||
# Usage:
|
||||
# set-active-plan.sh <plan_id> — pin .planning/.active_plan to plan_id
|
||||
# set-active-plan.sh — print the current active plan (if any)
|
||||
#
|
||||
# The active plan is stored in .planning/.active_plan and is read by
|
||||
# resolve-plan-dir.sh when no $PLAN_ID env var is set.
|
||||
|
||||
set -e
|
||||
|
||||
# List saved named plans, show the shared pointer, or change that pointer.
|
||||
# Usage: set-active-plan.sh [--list|-l|PLAN_ID]
|
||||
# Operates on the current project; listing never binds a host or injects data.
|
||||
set -eu
|
||||
PLAN_ROOT="${PWD}/.planning"
|
||||
ACTIVE_FILE="${PLAN_ROOT}/.active_plan"
|
||||
PWF_ROOT_PIN=""
|
||||
|
||||
# No args → show current active plan
|
||||
if [ "${1:-}" = "" ]; then
|
||||
if [ -f "${ACTIVE_FILE}" ]; then
|
||||
plan_id="$(tr -d '\r\n' < "${ACTIVE_FILE}")"
|
||||
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ]; then
|
||||
echo "Active plan: ${plan_id}"
|
||||
echo "Path: ${PLAN_ROOT}/${plan_id}"
|
||||
elif [ -n "${plan_id}" ]; then
|
||||
echo "Active plan pointer: ${plan_id} (directory not found — stale pointer)"
|
||||
else
|
||||
echo "No active plan set."
|
||||
fi
|
||||
# Use the resolver canonicalization policy without running plan selection.
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Pure-sh backslash-to-forward-slash normalizer; result lands in $NORM_OUT.
|
||||
# Windows-native coreutils builds (e.g. C:\Program Files\coreutils on PATH
|
||||
# ahead of Git's usr/bin) canonicalize MSYS-style /c/... input to C:\-style
|
||||
# backslash output. The containment prefix match below is written with forward
|
||||
# slashes, so without this normalization every canonical pair mismatches and
|
||||
# resolution silently fails. On POSIX systems paths contain no backslash and
|
||||
# this is the identity. A literal backslash in a Unix filename normalizes to
|
||||
# "/" and at worst fails containment — the safe direction. No subshell, no
|
||||
# fork: plain parameter expansion in a loop.
|
||||
norm_slashes() {
|
||||
NORM_OUT=""
|
||||
_ns_rest="$1"
|
||||
while :; do
|
||||
case "${_ns_rest}" in
|
||||
*\\*)
|
||||
NORM_OUT="${NORM_OUT}${_ns_rest%%\\*}/"
|
||||
_ns_rest="${_ns_rest#*\\}"
|
||||
;;
|
||||
*)
|
||||
NORM_OUT="${NORM_OUT}${_ns_rest}"
|
||||
break
|
||||
;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
out="$(realpath "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v readlink >/dev/null 2>&1; then
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -I -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment guard (security A1.3): a resolved plan dir must canonicalize to a
|
||||
# path under the project root (the CWD the script runs from). A symlink inside
|
||||
# a valid slug dir pointing at /etc or outside the workspace would otherwise let
|
||||
# the hooks hash and inject an arbitrary file. On any violation we return 1 so
|
||||
# the caller treats the candidate as unresolved and falls back safely.
|
||||
#
|
||||
# The root canonicalizes via the relative token "." rather than the $PWD
|
||||
# string. On some Windows/MSYS setups (8.3 short names, the /tmp mount alias)
|
||||
# realpath("$PWD") and realpath(relative-candidate) resolve through different
|
||||
# code paths and land on differently-spelled-but-equal targets, so the prefix
|
||||
# match below fails and resolution silently goes dark. "." resolves through
|
||||
# the same physical-cwd path candidates already use (same fix inject-plan.sh
|
||||
# received earlier; the resolver kept the $PWD form until now). Both sides are
|
||||
# backslash-normalized before comparison for Windows-native canonicalizers.
|
||||
# The root is computed once per run: the newest-mtime scan calls this guard
|
||||
# per plan dir, and each canonicalize costs a process spawn on Windows.
|
||||
#
|
||||
# With a PWF_PLAN_ROOT pin (issue #212) containment is checked against THAT
|
||||
# root instead of the cwd: candidates arrive ${PWF_PLAN_ROOT}/-prefixed, so
|
||||
# both sides canonicalize through the same path spelling. Unpinned keeps the
|
||||
# relative "." root — byte-identical to the legacy check.
|
||||
ROOT_REAL=""
|
||||
ROOT_REAL_SET=0
|
||||
is_within_root() {
|
||||
candidate="$1"
|
||||
if [ "${ROOT_REAL_SET}" = "0" ]; then
|
||||
ROOT_REAL="$(canonicalize "${PWF_ROOT_PIN:-.}")" || ROOT_REAL=""
|
||||
norm_slashes "${ROOT_REAL}"
|
||||
ROOT_REAL="${NORM_OUT}"
|
||||
ROOT_REAL_SET=1
|
||||
fi
|
||||
# Canonicalize the candidate through its cwd-RELATIVE form whenever it
|
||||
# lives under ${PWD}. The candidate string is built from ${PWD} (an MSYS
|
||||
# long-form spelling), while the root canonicalizes from "." (the process
|
||||
# cwd, which a caller may have set with an 8.3 short-form string). A
|
||||
# Windows-native realpath does not unify those spellings, so canonicalizing
|
||||
# both sides from the same cwd base is the only spelling-stable comparison.
|
||||
# The emitted result keeps the original absolute candidate — only the
|
||||
# containment check uses the relative form.
|
||||
# Pinned resolution skips the rewrite: candidate and root then share the
|
||||
# ${PWF_PLAN_ROOT} spelling, so both canonicalize directly from it.
|
||||
if [ -n "${PWF_ROOT_PIN}" ]; then
|
||||
check_target="${candidate}"
|
||||
else
|
||||
echo "No active plan set."
|
||||
case "${candidate}" in
|
||||
"${PWD}"/*) check_target=".${candidate#"${PWD}"}" ;;
|
||||
*) check_target="${candidate}" ;;
|
||||
esac
|
||||
fi
|
||||
cand_real="$(canonicalize "${check_target}")" || cand_real=""
|
||||
norm_slashes "${cand_real}"
|
||||
cand_real="${NORM_OUT}"
|
||||
if [ -z "${ROOT_REAL}" ] || [ -z "${cand_real}" ]; then
|
||||
# Slug validation blocks textual traversal, but only successful
|
||||
# canonicalization can rule out a symlink/junction escape.
|
||||
return 1
|
||||
fi
|
||||
case "${cand_real}" in
|
||||
"${ROOT_REAL}"|"${ROOT_REAL}"/*) return 0 ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Each phase contributes at most one status. An explicit Status line wins
|
||||
# over an inline heading marker. Fenced examples and unrelated sections are
|
||||
# not phases. Keep this parser aligned with the PowerShell helper.
|
||||
phase_status() {
|
||||
awk '
|
||||
function finish() {
|
||||
if (phase) {
|
||||
status = primary != "" ? primary : inline_status
|
||||
if (status == "complete") complete++
|
||||
else if (status == "in_progress") in_progress++
|
||||
else if (status == "pending") pending++
|
||||
}
|
||||
phase = 0; primary = ""; inline_status = ""
|
||||
}
|
||||
{
|
||||
line = $0
|
||||
sub(/\r$/, "", line)
|
||||
trimmed = line
|
||||
sub(/^ */, "", trimmed)
|
||||
if (line ~ /^ ? ? ?```/ || line ~ /^ ? ? ?~~~/) {
|
||||
marker = substr(trimmed, 1, 1)
|
||||
run = 0
|
||||
while (substr(trimmed, run + 1, 1) == marker) run++
|
||||
if (fence == "") { fence = marker; fence_length = run }
|
||||
else if (marker == fence && run >= fence_length && substr(trimmed, run + 1) ~ /^[ \t]*$/) fence = ""
|
||||
next
|
||||
}
|
||||
if (fence != "") next
|
||||
if (line ~ /^ ? ? ?###[ \t]+(Phase|Fase|المرحلة|阶段|階段)[ \t]+[0-9]+([^0-9A-Za-z_]|$)/) {
|
||||
finish(); phase = 1; total++
|
||||
if (match(line, /\[(complete|in_progress|pending)\]/))
|
||||
inline_status = substr(line, RSTART + 1, RLENGTH - 2)
|
||||
} else if (line ~ /^ ? ? ?(###|##|#)([ \t]|$)/) {
|
||||
finish()
|
||||
} else if (phase && primary == "" && line ~ /^ ? ? ?(-[ \t]+)?\*\*(Status:|Estado:|الحالة:|状态:|狀態:)\*\*[ \t]+(complete|in_progress|pending)([ \t]|$)/) {
|
||||
sub(/^ ? ? ?(-[ \t]+)?\*\*(Status:|Estado:|الحالة:|状态:|狀態:)\*\*[ \t]+/, "", line)
|
||||
sub(/[ \t].*$/, "", line)
|
||||
primary = line
|
||||
}
|
||||
}
|
||||
END {
|
||||
finish()
|
||||
printf "%d/%d complete, %d in_progress, %d pending", complete, total, in_progress, pending
|
||||
}
|
||||
' < "$1"
|
||||
}
|
||||
|
||||
current_active() {
|
||||
if [ -f "${ACTIVE_FILE}" ] && is_within_root "${ACTIVE_FILE}"; then
|
||||
_current="$(tr '\r' '\n' < "${ACTIVE_FILE}")"
|
||||
# Windows editors and older PowerShell defaults can leave a UTF-8 BOM.
|
||||
# Treat it as an encoding marker, not part of the shared plan slug.
|
||||
_utf8_bom="$(printf '\357\273\277')"
|
||||
case "${_current}" in
|
||||
"${_utf8_bom}"*) _current="${_current#"${_utf8_bom}"}" ;;
|
||||
esac
|
||||
slug_is_valid "${_current}" && printf '%s\n' "${_current}"
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
list_plans() {
|
||||
if [ ! -d "${PLAN_ROOT}" ]; then
|
||||
printf '%s\n' 'No planning directory found.'
|
||||
return 0
|
||||
fi
|
||||
if ! is_within_root "${PLAN_ROOT}"; then
|
||||
printf '%s\n' 'Error: planning directory is outside the project or cannot be verified.' >&2
|
||||
return 1
|
||||
fi
|
||||
_active="$(current_active)"
|
||||
_found=0
|
||||
printf '%s\n' 'Available plans:'
|
||||
for _dir in "${PLAN_ROOT}"/*; do
|
||||
[ -d "${_dir}" ] || continue
|
||||
_id="${_dir##*/}"
|
||||
slug_is_valid "${_id}" || continue
|
||||
is_within_root "${_dir}" || continue
|
||||
_plan_file="${_dir}/task_plan.md"
|
||||
[ -f "${_plan_file}" ] && [ -r "${_plan_file}" ] || continue
|
||||
is_within_root "${_plan_file}" || continue
|
||||
_status="$(phase_status "${_plan_file}")" || continue
|
||||
_marker=''
|
||||
if [ "${_id}" = "${_active}" ]; then _marker=' [active]'; fi
|
||||
printf '%s\n' "- ${_id}${_marker} - ${_status}"
|
||||
_found=1
|
||||
done
|
||||
if [ "${_found}" -eq 0 ]; then
|
||||
printf '%s\n' 'No named plans found.'
|
||||
else
|
||||
printf '%s\n' '[active] marks the shared default pointer. Set PLAN_ID to pin a session.'
|
||||
fi
|
||||
}
|
||||
|
||||
if [ "$#" -gt 1 ]; then
|
||||
printf '%s\n' 'Error: list plans or set PLAN_ID in separate calls.' >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
case "${1:-}" in
|
||||
--list|-l) list_plans; exit $? ;;
|
||||
--help|-h)
|
||||
printf '%s\n' 'Usage: set-active-plan.sh [--list|PLAN_ID]' \
|
||||
'Lists saved named plans in the current project without selecting a plan.'
|
||||
exit 0 ;;
|
||||
esac
|
||||
|
||||
if [ "${1:-}" = '' ]; then
|
||||
if [ -d "${PLAN_ROOT}" ] && ! is_within_root "${PLAN_ROOT}"; then
|
||||
printf '%s\n' 'Error: planning directory is outside the project or cannot be verified.' >&2
|
||||
exit 1
|
||||
fi
|
||||
plan_id="$(current_active)"
|
||||
if [ -n "${plan_id}" ] && [ -d "${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)"
|
||||
else
|
||||
printf '%s\n' 'No active plan set.'
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
|
||||
PLAN_ID="$1"
|
||||
PLAN_DIR="${PLAN_ROOT}/${PLAN_ID}"
|
||||
|
||||
if [ ! -d "${PLAN_DIR}" ]; then
|
||||
echo "Error: plan directory not found: ${PLAN_DIR}" >&2
|
||||
echo "Run: init-session.sh \"${PLAN_ID}\" to create it, or check .planning/ for available plans." >&2
|
||||
if ! slug_is_valid "${PLAN_ID}"; then
|
||||
printf '%s\n' 'Error: invalid plan ID. Use a named directory under .planning.' >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mkdir -p "${PLAN_ROOT}"
|
||||
printf "%s\n" "${PLAN_ID}" > "${ACTIVE_FILE}"
|
||||
|
||||
echo "Active plan set to: ${PLAN_ID}"
|
||||
echo "Path: ${PLAN_DIR}"
|
||||
echo ""
|
||||
echo "To pin this terminal session only:"
|
||||
echo " export PLAN_ID=${PLAN_ID}"
|
||||
PLAN_DIR="${PLAN_ROOT}/${PLAN_ID}"
|
||||
if [ ! -d "${PLAN_DIR}" ]; then
|
||||
printf '%s\n' "Error: plan directory not found: ${PLAN_DIR}" \
|
||||
"Run: init-session.sh \"${PLAN_ID}\" to create it, or use --list to see available plans." >&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
|
||||
fi
|
||||
# A pre-existing pointer must itself be a contained regular file before writing.
|
||||
if { [ -e "${ACTIVE_FILE}" ] || [ -L "${ACTIVE_FILE}" ]; } &&
|
||||
{ [ -L "${ACTIVE_FILE}" ] || [ ! -f "${ACTIVE_FILE}" ] || ! is_within_root "${ACTIVE_FILE}"; }; then
|
||||
printf '%s\n' 'Error: active plan pointer is not a safe file inside the project.' >&2
|
||||
exit 1
|
||||
fi
|
||||
# Replace the pointer atomically instead of truncating a possible hardlink.
|
||||
# mktemp creates a private, exclusive file beside the destination.
|
||||
temp_file="$(mktemp "${PLAN_ROOT}/.active_plan.XXXXXX")" || {
|
||||
printf '%s\n' 'Error: could not create the active plan pointer.' >&2
|
||||
exit 1
|
||||
}
|
||||
trap 'rm -f "${temp_file}"' EXIT
|
||||
trap 'exit 1' HUP INT TERM
|
||||
printf '%s\n' "${PLAN_ID}" > "${temp_file}"
|
||||
if ! mv -f "${temp_file}" "${ACTIVE_FILE}"; then
|
||||
printf '%s\n' 'Error: could not replace the active plan pointer.' >&2
|
||||
exit 1
|
||||
fi
|
||||
trap - EXIT HUP INT TERM
|
||||
printf '%s\n' "Active plan set to: ${PLAN_ID}" "Path: ${PLAN_DIR}" '' \
|
||||
'To pin this terminal session only:' " export PLAN_ID=${PLAN_ID}"
|
||||
|
||||
@@ -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.17.0"
|
||||
"version": "3.18.2"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "planning-with-files",
|
||||
"version": "3.17.0",
|
||||
"version": "3.18.2",
|
||||
"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.17.0"
|
||||
version: "3.18.2"
|
||||
|
||||
---
|
||||
|
||||
@@ -46,7 +46,7 @@ Work like Manus: Use persistent markdown files as your "working memory on disk."
|
||||
|
||||
## FIRST: Restore Project State
|
||||
|
||||
**Before continuing**, resolve the plan this task owns. Use the installed `scripts/resolve-plan-dir.sh` (or `.ps1`) with the host's `PLAN_ID` and `PWF_PLAN_ROOT`, then read `task_plan.md`, `progress.md`, and `findings.md` from that selected directory. If an explicit selector is rejected, or session isolation is armed with multiple plans and no `PLAN_ID`, correct the pin and do not fall back to another task. Run `git diff --stat` for code changes not yet recorded there. All planning filenames below mean that selected directory. For parallel tasks, pin each host before it starts or use separate worktrees; a child process export does not change its host. One orchestrator owns a shared plan and summaries, while workers use assigned files or ledgers.
|
||||
**Before continuing**, resolve the plan this task owns. Use the installed `scripts/resolve-plan-dir.sh` (or `.ps1`) with the host's `PLAN_ID` and `PWF_PLAN_ROOT`, then read `task_plan.md`, `progress.md`, and `findings.md` from that selected directory. If an explicit selector is rejected, or multiple named plans exist without `PLAN_ID`, correct the pin and do not fall back to another task. Run `git diff --stat` for code changes not yet recorded there. All planning filenames below mean that selected directory. For parallel tasks, pin each host before it starts or use separate worktrees; a child process export does not change its host. One orchestrator owns a shared plan and summaries, while workers use assigned files or ledgers.
|
||||
|
||||
```bash
|
||||
# Linux/macOS — auto-detects skill directory (plugin env or default install path)
|
||||
@@ -213,6 +213,12 @@ Helper scripts for automation:
|
||||
- `scripts/check-complete.sh` — Verify all phases complete
|
||||
- `scripts/session-catchup.py`: Explicit same-project session-record aggregation or bounded replay (`--metadata` / `--replay`); bare invocation does not access host history
|
||||
|
||||
### List saved plans
|
||||
|
||||
To find a task before resuming it, run `sh "<skill-dir>/scripts/set-active-plan.sh" --list` or, in Windows PowerShell, `& "<skill-dir>/scripts/set-active-plan.ps1" -List`. Replace `<skill-dir>` with this installed skill directory and keep your current directory at the project root.
|
||||
|
||||
This read-only command lists named plans and phase progress under the current directory's `.planning/`. `[active]` marks the shared default pointer; it does not bind a session. Concurrent tasks still require each host's `PLAN_ID` or separate worktrees.
|
||||
|
||||
## Advanced Topics
|
||||
|
||||
- **Manus Principles:** See [reference.md](reference.md)
|
||||
|
||||
@@ -404,6 +404,7 @@ function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
$resolvedDir = @(& $resolver | Where-Object { $_ }) | Select-Object -First 1
|
||||
if (-not $resolvedDir -and ((& $resolver -CheckAmbiguity) -eq "PWF_PLAN_AMBIGUOUS_V1")) { return $null }
|
||||
if ($resolvedDir) {
|
||||
$planFile = Join-Path $resolvedDir "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $planFile -ExpectedDirectory $resolvedDir)
|
||||
|
||||
@@ -45,6 +45,10 @@ resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
plan_dir="$(sh "${RESOLVER}" 2>/dev/null)"
|
||||
if [ -z "$plan_dir" ] && [ "$(sh "${RESOLVER}" --check-ambiguity 2>/dev/null)" = "PWF_PLAN_AMBIGUOUS_V1" ]; then
|
||||
printf "[plan-attest] Multiple plans are available. Set PLAN_ID=<slug>; nothing was attested.\n" >&2
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
if [ -n "${plan_dir}" ] && [ -f "${plan_dir}/task_plan.md" ]; then
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
|
||||
@@ -35,6 +35,7 @@ if ($PlanFile -ne "") {
|
||||
try {
|
||||
$resolvedDir = (& $resolver 2>$null | Select-Object -First 1)
|
||||
if ($null -eq $resolvedDir) { $resolvedDir = "" }
|
||||
if (-not $resolvedDir -and ((& $resolver -CheckAmbiguity) -eq "PWF_PLAN_AMBIGUOUS_V1")) { exit 0 }
|
||||
} catch {
|
||||
$resolvedDir = ""
|
||||
}
|
||||
|
||||
@@ -56,6 +56,9 @@ else
|
||||
RESOLVED_DIR=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
RESOLVED_DIR="$(sh "${RESOLVER}" 2>/dev/null)"
|
||||
if [ -z "$RESOLVED_DIR" ] && [ "$(sh "${RESOLVER}" --check-ambiguity 2>/dev/null)" = "PWF_PLAN_AMBIGUOUS_V1" ]; then
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
if [ -n "${RESOLVED_DIR}" ] && [ -f "${RESOLVED_DIR}/task_plan.md" ]; then
|
||||
PLAN_FILE="${RESOLVED_DIR}/task_plan.md"
|
||||
|
||||
@@ -59,12 +59,9 @@ Windows runs the shell chain through Git Bash and nothing else:
|
||||
one turn-marker slot and one progress-guard slot per plan.
|
||||
|
||||
Known, accepted differences from the shell reference:
|
||||
* Two plan directories with the same whole-second mtime, no .active_plan
|
||||
and no PLAN_ID: the reference picks the first in the shell's glob order
|
||||
(locale collation), this twin the first in code-point order. The same
|
||||
collation difference can change which three of four or more nested
|
||||
projects the ambiguity notice names. A machine runs one implementation,
|
||||
so neither choice flips within a session.
|
||||
* Shell glob order follows locale collation; this twin uses code-point
|
||||
order. This can change which three of four or more nested projects the
|
||||
ambiguity notice names.
|
||||
* BSD sed (macOS) appends a newline to a progress.md whose last line has
|
||||
none; GNU sed and this twin do not.
|
||||
* With PWF_PLAN_ROOT set under Git Bash the shell sees the pin as typed
|
||||
@@ -837,6 +834,16 @@ class Injector(object):
|
||||
scope = ""
|
||||
explicit = bool(plan_prefix)
|
||||
plan_id = env.get("PLAN_ID", "")
|
||||
ambiguous = plan_is_ambiguous(
|
||||
plan_prefix + ".planning", plan_root_pin if plan_root_pin else ".", plan_id
|
||||
)
|
||||
if ambiguous and (context == "preflight" or not is_dir(plan_prefix + ".planning/sessions")):
|
||||
if context == "userprompt":
|
||||
self.echo(
|
||||
"[planning-with-files] Multiple plans are available. Set PLAN_ID=<slug> "
|
||||
"for this session; nothing injected."
|
||||
)
|
||||
raise Bail()
|
||||
if plan_id:
|
||||
if slug_is_valid(plan_id) and is_dir(plan_prefix + ".planning/" + plan_id):
|
||||
resolved = plan_prefix + ".planning/" + plan_id
|
||||
@@ -923,30 +930,14 @@ class Injector(object):
|
||||
"single-session mode."
|
||||
)
|
||||
raise Bail()
|
||||
if not plan_id:
|
||||
plan_n = 1 if is_file(plan_prefix + "task_plan.md") else 0
|
||||
try:
|
||||
names = sorted(os.listdir(plan_prefix + ".planning"))
|
||||
except OSError:
|
||||
names = []
|
||||
for name in names:
|
||||
if name.startswith("."):
|
||||
continue
|
||||
if not is_file(plan_prefix + ".planning/" + name + "/task_plan.md"):
|
||||
continue
|
||||
if not slug_is_valid(name):
|
||||
continue
|
||||
plan_n += 1
|
||||
if plan_n > 1:
|
||||
break
|
||||
if plan_n > 1:
|
||||
if context == "userprompt":
|
||||
self.echo(
|
||||
"[planning-with-files] Multiple plans are available while session "
|
||||
"isolation is armed. Set PLAN_ID=<slug> for this session; nothing "
|
||||
"injected."
|
||||
)
|
||||
raise Bail()
|
||||
if ambiguous:
|
||||
if context == "userprompt":
|
||||
self.echo(
|
||||
"[planning-with-files] Multiple plans are available while session "
|
||||
"isolation is armed. Set PLAN_ID=<slug> for this session; nothing "
|
||||
"injected."
|
||||
)
|
||||
raise Bail()
|
||||
|
||||
if not explicit:
|
||||
nested = []
|
||||
@@ -1326,6 +1317,23 @@ def inject(context, env=None):
|
||||
# Twin of resolve-plan-dir.sh (the shared resolver the dispatcher uses).
|
||||
# --------------------------------------------------------------------------
|
||||
|
||||
def plan_is_ambiguous(plan_root, project_root, plan_id=""):
|
||||
"""A project pointer or mtime cannot bind a session to multiple plans."""
|
||||
if plan_id:
|
||||
return False
|
||||
count = 1 if is_dir(plan_root + "/sessions") and is_file(project_root + "/task_plan.md") else 0
|
||||
try:
|
||||
names = os.listdir(plan_root)
|
||||
except OSError:
|
||||
names = []
|
||||
for name in names:
|
||||
if slug_is_valid(name) and is_file(plan_root + "/" + name + "/task_plan.md"):
|
||||
count += 1
|
||||
if count > 1:
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
def resolve_plan_dir(env=None):
|
||||
"""Return (spelled, filesystem) paths of the plan directory, or ("", "").
|
||||
|
||||
@@ -1360,6 +1368,9 @@ def resolve_plan_dir(env=None):
|
||||
return found(plan_id)
|
||||
return ("", "")
|
||||
|
||||
if plan_is_ambiguous(fs_root, pin if pin else "."):
|
||||
return ("", "")
|
||||
|
||||
active_file = fs_root + "/.active_plan"
|
||||
if is_file(active_file):
|
||||
try:
|
||||
@@ -1441,6 +1452,8 @@ class ClaudeDispatcher(object):
|
||||
return (spelled, fs)
|
||||
if self.env.get("PLAN_ID", "") or self.env.get("PWF_PLAN_ROOT", ""):
|
||||
return ("", "")
|
||||
if plan_is_ambiguous(".planning", "."):
|
||||
return ("", "")
|
||||
if is_file("task_plan.md"):
|
||||
return (".", ".")
|
||||
return ("", "")
|
||||
|
||||
@@ -254,6 +254,29 @@ is_within_root() {
|
||||
# The .active_plan pointer, the newest-by-mtime fallback, and the legacy root
|
||||
# task_plan.md are cwd GUESSES — only guesses are subject to the nested-root
|
||||
# conflict check below.
|
||||
# Shared .active_plan and directory mtime cannot identify this session's plan.
|
||||
# Check before selection or preflight, even when isolation was never armed.
|
||||
PLAN_AMBIGUOUS=0
|
||||
if [ -z "${PLAN_ID:-}" ]; then
|
||||
PLAN_COUNT=0
|
||||
if [ -d "${PLAN_PREFIX}.planning/sessions" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; 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}"
|
||||
slug_is_valid "${plan_candidate_dir##*/}" || continue
|
||||
PLAN_COUNT=$((PLAN_COUNT + 1))
|
||||
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
|
||||
done
|
||||
fi
|
||||
if [ "$PLAN_AMBIGUOUS" = "1" ] && { [ "$CONTEXT" = "preflight" ] || [ ! -d "${PLAN_PREFIX}.planning/sessions" ]; }; then
|
||||
if [ "$CONTEXT" = "userprompt" ]; then
|
||||
echo "[planning-with-files] Multiple plans are available. Set PLAN_ID=<slug> for this session; nothing injected."
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
|
||||
RESOLVED=""
|
||||
SCOPE=""
|
||||
EXPLICIT=0
|
||||
@@ -442,27 +465,13 @@ PY
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# An attachment admits a session but does not select one of several plans.
|
||||
# When isolation is armed, require PLAN_ID if more than one live same-root
|
||||
# candidate exists. PWF_PLAN_ROOT selects the project root, not a plan
|
||||
# within that root.
|
||||
if [ -z "${PLAN_ID:-}" ]; then
|
||||
SESSION_PLAN_N=0
|
||||
[ -f "${PLAN_PREFIX}task_plan.md" ] && SESSION_PLAN_N=1
|
||||
for candidate in "${PLAN_PREFIX}".planning/*/task_plan.md; do
|
||||
[ -f "$candidate" ] || continue
|
||||
candidate_dir="${candidate%/task_plan.md}"
|
||||
candidate_slug="${candidate_dir##*/}"
|
||||
slug_is_valid "$candidate_slug" || continue
|
||||
SESSION_PLAN_N=$((SESSION_PLAN_N + 1))
|
||||
[ "$SESSION_PLAN_N" -gt 1 ] && break
|
||||
done
|
||||
if [ "$SESSION_PLAN_N" -gt 1 ]; then
|
||||
if [ "$CONTEXT" = "userprompt" ]; then
|
||||
echo "[planning-with-files] Multiple plans are available while session isolation is armed. Set PLAN_ID=<slug> for this session; nothing injected."
|
||||
fi
|
||||
exit 0
|
||||
# Attachment admits a session but does not select its plan. Preserve the
|
||||
# attachment-first notice above for sessions that never opted in.
|
||||
if [ "$PLAN_AMBIGUOUS" = "1" ]; then
|
||||
if [ "$CONTEXT" = "userprompt" ]; then
|
||||
echo "[planning-with-files] Multiple plans are available while session isolation is armed. Set PLAN_ID=<slug> for this session; nothing injected."
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@@ -13,7 +13,8 @@
|
||||
# junction/symlink escape; slug validation alone blocks textual traversal.
|
||||
|
||||
param(
|
||||
[string]$PlanRoot = (Join-Path (Get-Location) ".planning")
|
||||
[string]$PlanRoot = (Join-Path (Get-Location) ".planning"),
|
||||
[switch]$CheckAmbiguity
|
||||
)
|
||||
|
||||
$projectRoot = (Get-Location).Path
|
||||
@@ -137,6 +138,30 @@ $activeFile = Join-Path $PlanRoot ".active_plan"
|
||||
# at rc=0. Emptiness is the fail-closed signal on this channel, matching
|
||||
# resolve-plan-dir.sh and the PWF_PLAN_ROOT pin. An empty $env:PLAN_ID is
|
||||
# falsy here and still means "unset".
|
||||
# The optional probe distinguishes ambiguity from a legacy-root fallback.
|
||||
# Multiple named plans require PLAN_ID even without a sessions directory.
|
||||
$planCount = 0
|
||||
if (-not $env:PLAN_ID) {
|
||||
if ((Test-Path -LiteralPath (Join-Path $PlanRoot "sessions") -PathType Container) -and
|
||||
(Test-Path -LiteralPath (Join-Path $projectRoot "task_plan.md") -PathType Leaf)) {
|
||||
$planCount = 1
|
||||
}
|
||||
if (Test-Path -LiteralPath $PlanRoot -PathType Container) {
|
||||
foreach ($entry in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue)) {
|
||||
if ((Test-ValidSlug $entry.Name) -and
|
||||
(Test-Path -LiteralPath (Join-Path $entry.FullName "task_plan.md") -PathType Leaf)) {
|
||||
$planCount++
|
||||
if ($planCount -gt 1) { break }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($CheckAmbiguity) {
|
||||
if ($planCount -gt 1) { Write-Output "PWF_PLAN_AMBIGUOUS_V1" }
|
||||
exit 0
|
||||
}
|
||||
if ($planCount -gt 1) { exit 0 }
|
||||
|
||||
if ($env:PLAN_ID) {
|
||||
if (Test-ValidSlug $env:PLAN_ID) {
|
||||
$candidate = Join-Path $PlanRoot $env:PLAN_ID
|
||||
|
||||
@@ -15,6 +15,13 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Optional probe distinguishes ambiguity from the empty legacy-root result.
|
||||
# Both modes keep stdout data-only and always exit zero.
|
||||
CHECK_AMBIGUITY=0
|
||||
if [ "${1:-}" = "--check-ambiguity" ]; then
|
||||
CHECK_AMBIGUITY=1
|
||||
shift
|
||||
fi
|
||||
PLAN_ROOT="${1:-${PWD}/.planning}"
|
||||
|
||||
# --- PWF_PLAN_ROOT: absolute plan-root binding (issue #212). ---
|
||||
@@ -321,6 +328,29 @@ resolve_latest_dir() {
|
||||
# the fail-closed signal on this channel, exactly as the PWF_PLAN_ROOT guard
|
||||
# above already does it; a non-zero status would kill callers running under
|
||||
# set -e for a condition that is not an internal error.
|
||||
# A shared pointer or mtime is not a per-session binding (issue #240).
|
||||
# Count conservatively, just like injection: slug-valid live plan files.
|
||||
# The legacy root joins the count only when session isolation is armed.
|
||||
PLAN_AMBIGUOUS=0
|
||||
if [ -z "${PLAN_ID:-}" ]; then
|
||||
PLAN_COUNT=0
|
||||
if [ -d "${PLAN_ROOT}/sessions" ] && [ -f "${PWF_ROOT_PIN:-.}/task_plan.md" ]; 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}"
|
||||
slug_is_valid "${plan_candidate_dir##*/}" || continue
|
||||
PLAN_COUNT=$((PLAN_COUNT + 1))
|
||||
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
|
||||
done
|
||||
fi
|
||||
if [ "$CHECK_AMBIGUITY" = "1" ]; then
|
||||
[ "$PLAN_AMBIGUOUS" = "1" ] && printf '%s\n' 'PWF_PLAN_AMBIGUOUS_V1'
|
||||
exit 0
|
||||
fi
|
||||
[ "$PLAN_AMBIGUOUS" = "1" ] && exit 0
|
||||
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
resolve_from_env && exit 0
|
||||
exit 0
|
||||
|
||||
Regular → Executable
+266
-16
@@ -1,27 +1,245 @@
|
||||
# planning-with-files: set or display the active plan pointer (PowerShell).
|
||||
# planning-with-files: set, display, or list the active plan pointer (PowerShell).
|
||||
#
|
||||
# Usage:
|
||||
# .\set-active-plan.ps1 <plan_id> - pin .planning\.active_plan to plan_id
|
||||
# .\set-active-plan.ps1 - print the current active plan (if any)
|
||||
# .\set-active-plan.ps1 -List - list available named plans and phase counts
|
||||
# .\set-active-plan.ps1 --list - equivalent to -List and -l
|
||||
|
||||
param(
|
||||
[string]$PlanId = ""
|
||||
[Parameter(Position = 0)]
|
||||
[string]$PlanId = "",
|
||||
[Alias('l', '-list')]
|
||||
[switch]$List,
|
||||
[Alias('h', '-help')]
|
||||
[switch]$Help
|
||||
)
|
||||
|
||||
$PlanRoot = Join-Path (Get-Location) ".planning"
|
||||
$ProjectRoot = (Get-Location).Path
|
||||
# Windows PowerShell 5.1 can silently change directories when -File inherits
|
||||
# a cwd containing wildcard characters. Recover that physical cwd only for a
|
||||
# direct invocation of this script; interactive Set-Location remains primary.
|
||||
if ($PSVersionTable.PSVersion.Major -eq 5 -and
|
||||
[System.Management.Automation.WildcardPattern]::ContainsWildcardCharacters([Environment]::CurrentDirectory)) {
|
||||
$processArgs = [Environment]::GetCommandLineArgs()
|
||||
for ($index = 0; $index -lt ($processArgs.Length - 1); $index++) {
|
||||
if ($processArgs[$index] -ieq '-File') {
|
||||
$entryScript = $processArgs[$index + 1]
|
||||
if (-not [IO.Path]::IsPathRooted($entryScript)) {
|
||||
$entryScript = Join-Path ([Environment]::CurrentDirectory) $entryScript
|
||||
}
|
||||
if ([IO.Path]::GetFullPath($entryScript) -eq [IO.Path]::GetFullPath($PSCommandPath)) {
|
||||
$ProjectRoot = [Environment]::CurrentDirectory
|
||||
}
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
$PlanRoot = Join-Path $ProjectRoot ".planning"
|
||||
$ActiveFile = Join-Path $PlanRoot ".active_plan"
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
|
||||
# Resolve-Path can retain a junction's spelling. Like resolve-plan-dir.ps1,
|
||||
# open the actual filesystem object before checking the project boundary.
|
||||
# The Windows handle supports both directories and task_plan.md files.
|
||||
function Get-FinalPath {
|
||||
param([string]$Path)
|
||||
if (-not ("PwfPlanListingNative" -as [type])) {
|
||||
Add-Type -ErrorAction Stop -TypeDefinition @'
|
||||
using System;
|
||||
using System.ComponentModel;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
using Microsoft.Win32.SafeHandles;
|
||||
|
||||
public static class PwfPlanListingNative {
|
||||
[DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
|
||||
private static extern SafeFileHandle CreateFileW(
|
||||
string name, uint access, uint share, IntPtr security,
|
||||
uint creation, uint flags, IntPtr template);
|
||||
[DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
|
||||
private static extern uint GetFinalPathNameByHandleW(
|
||||
SafeFileHandle handle, StringBuilder path, uint length, uint flags);
|
||||
[DllImport("libc", SetLastError = true)]
|
||||
private static extern IntPtr realpath(string path, IntPtr resolved);
|
||||
[DllImport("libc")]
|
||||
private static extern void free(IntPtr pointer);
|
||||
|
||||
public static string FinalPath(string path) {
|
||||
if (Environment.OSVersion.Platform != PlatformID.Win32NT) {
|
||||
IntPtr resolved = realpath(path, IntPtr.Zero);
|
||||
if (resolved == IntPtr.Zero) throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
try { return Marshal.PtrToStringAnsi(resolved); }
|
||||
finally { free(resolved); }
|
||||
}
|
||||
// OPEN_EXISTING, FILE_SHARE_READ | WRITE | DELETE, BACKUP_SEMANTICS.
|
||||
using (SafeFileHandle handle = CreateFileW(
|
||||
path, 0, 7, IntPtr.Zero, 3, 0x02000000, IntPtr.Zero)) {
|
||||
if (handle.IsInvalid) throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
StringBuilder buffer = new StringBuilder(32768);
|
||||
uint length = GetFinalPathNameByHandleW(handle, buffer, (uint)buffer.Capacity, 0);
|
||||
if (length == 0 || length >= buffer.Capacity)
|
||||
throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
string result = buffer.ToString();
|
||||
if (result.StartsWith(@"\\?\UNC\", StringComparison.OrdinalIgnoreCase))
|
||||
return @"\\" + result.Substring(8);
|
||||
if (result.StartsWith(@"\\?\", StringComparison.OrdinalIgnoreCase))
|
||||
return result.Substring(4);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
'@
|
||||
}
|
||||
return [PwfPlanListingNative]::FinalPath($Path)
|
||||
}
|
||||
|
||||
function Test-WithinRoot {
|
||||
param([string]$Path)
|
||||
try {
|
||||
$rootReal = (Get-FinalPath $ProjectRoot).TrimEnd('\', '/')
|
||||
$pathReal = (Get-FinalPath $Path).TrimEnd('\', '/')
|
||||
$comparison = [StringComparison]::Ordinal
|
||||
if ($script:IsWindowsHost) { $comparison = [StringComparison]::OrdinalIgnoreCase }
|
||||
return $pathReal.Equals($rootReal, $comparison) -or
|
||||
$pathReal.StartsWith($rootReal + [IO.Path]::DirectorySeparatorChar, $comparison)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
}
|
||||
|
||||
function Test-ValidSlug {
|
||||
param([string]$Name)
|
||||
return $Name -cmatch '^[A-Za-z0-9_][A-Za-z0-9._-]*\z'
|
||||
}
|
||||
|
||||
function Test-SafeActiveFile {
|
||||
param([switch]$AllowLink)
|
||||
$item = Get-Item -LiteralPath $ActiveFile -Force -ErrorAction SilentlyContinue
|
||||
if (-not $item) { return $false }
|
||||
# Reading may follow a verified in-project link; writing must not.
|
||||
return -not $item.PSIsContainer -and
|
||||
($AllowLink -or (($item.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) -and
|
||||
(Test-WithinRoot $ActiveFile)
|
||||
}
|
||||
|
||||
function Get-CurrentActivePlan {
|
||||
if (-not (Test-SafeActiveFile -AllowLink)) { return "" }
|
||||
try {
|
||||
$current = ([string](Get-Content -LiteralPath $ActiveFile -Raw -Encoding UTF8 -ErrorAction Stop)).Trim([char[]]"`r`n")
|
||||
if (Test-ValidSlug $current) { return $current }
|
||||
} catch { }
|
||||
return ""
|
||||
}
|
||||
|
||||
function Add-PhaseStatus {
|
||||
param([hashtable]$Counts, $Phase)
|
||||
if ($null -eq $Phase) { return }
|
||||
$status = $Phase.Inline
|
||||
if ($Phase.Primary) { $status = $Phase.Primary }
|
||||
if ($status) { $Counts[$status]++ }
|
||||
}
|
||||
|
||||
function Get-PhaseStatus {
|
||||
param([string]$PlanFile)
|
||||
$counts = @{ total = 0; complete = 0; in_progress = 0; pending = 0 }
|
||||
$phase = $null
|
||||
$fence = ""
|
||||
$fenceLength = 0
|
||||
# The shipped translations keep status identifiers in English. Unicode
|
||||
# escapes preserve Windows PowerShell 5.1 compatibility without a BOM.
|
||||
$phaseLabel = '(?:Phase|Fase|\u0627\u0644\u0645\u0631\u062d\u0644\u0629|\u9636\u6bb5|\u968e\u6bb5)'
|
||||
$statusLabel = '(?:Status:|Estado:|\u0627\u0644\u062d\u0627\u0644\u0629:|\u72b6\u6001\uff1a|\u72c0\u614b\uff1a)'
|
||||
# Read once; an empty file is a valid plan with zero phases.
|
||||
$content = [string](Get-Content -LiteralPath $PlanFile -Raw -Encoding UTF8 -ErrorAction Stop)
|
||||
foreach ($line in ($content -split '\r?\n')) {
|
||||
if ($fence) {
|
||||
$closing = '^ {0,3}' + [regex]::Escape($fence) + '{' + $fenceLength + ',}[ \t]*$'
|
||||
if ($line -match $closing) { $fence = "" }
|
||||
continue
|
||||
}
|
||||
if ($line -match '^ {0,3}(`{3,}|~{3,})') {
|
||||
$fence = $Matches[1].Substring(0, 1)
|
||||
$fenceLength = $Matches[1].Length
|
||||
continue
|
||||
}
|
||||
if ($line -cmatch ('^ {0,3}###[ \t]+' + $phaseLabel + '[ \t]+[0-9]+(?:[^0-9A-Za-z_]|$)')) {
|
||||
Add-PhaseStatus $counts $phase
|
||||
$phase = @{ Primary = ""; Inline = "" }
|
||||
$counts.total++
|
||||
if ($line -cmatch '\[(complete|in_progress|pending)\]') {
|
||||
$phase.Inline = $Matches[1]
|
||||
}
|
||||
continue
|
||||
}
|
||||
if ($line -match '^ {0,3}#{1,3}(?:[ \t]+|$)') {
|
||||
Add-PhaseStatus $counts $phase
|
||||
$phase = $null
|
||||
continue
|
||||
}
|
||||
if ($null -ne $phase -and -not $phase.Primary -and
|
||||
$line -cmatch ('^ {0,3}(?:-[ \t]+)?\*\*' + $statusLabel + '\*\*[ \t]+(complete|in_progress|pending)(?:[ \t]|$)')) {
|
||||
$phase.Primary = $Matches[1]
|
||||
}
|
||||
}
|
||||
Add-PhaseStatus $counts $phase
|
||||
return "$($counts.complete)/$($counts.total) complete, $($counts.in_progress) in_progress, $($counts.pending) pending"
|
||||
}
|
||||
|
||||
function Show-PlanList {
|
||||
if (-not (Test-Path -LiteralPath $PlanRoot -PathType Container)) {
|
||||
Write-Output "No planning directory found."
|
||||
return
|
||||
}
|
||||
if (-not (Test-WithinRoot $PlanRoot)) {
|
||||
Write-Error "Error: planning directory is outside the project or cannot be verified."
|
||||
exit 1
|
||||
}
|
||||
$active = Get-CurrentActivePlan
|
||||
Write-Output "Available plans:"
|
||||
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)) {
|
||||
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 }
|
||||
try { $status = Get-PhaseStatus $planFile } catch { continue }
|
||||
$marker = ""
|
||||
if ($plan.Name -ceq $active) { $marker = " [active]" }
|
||||
Write-Output "- $($plan.Name)$marker - $status"
|
||||
$found = $true
|
||||
}
|
||||
if (-not $found) { Write-Output "No named plans found." }
|
||||
}
|
||||
|
||||
if ($Help -or $PlanId -eq "--help" -or $PlanId -eq "-h") {
|
||||
Write-Output "Usage: set-active-plan.ps1 [-List|-l|--list|PLAN_ID]"
|
||||
exit 0
|
||||
}
|
||||
|
||||
if ($List -or $PlanId -eq "--list" -or $PlanId -eq "-l") {
|
||||
if ($List -and $PlanId) {
|
||||
Write-Error "Error: list plans or set PLAN_ID in separate calls."
|
||||
exit 1
|
||||
}
|
||||
Show-PlanList
|
||||
exit 0
|
||||
}
|
||||
|
||||
if ($PlanId -eq "") {
|
||||
if (Test-Path $ActiveFile) {
|
||||
$current = (Get-Content $ActiveFile -Raw -Encoding UTF8).Trim()
|
||||
$current = ""
|
||||
if ((Test-Path -LiteralPath $PlanRoot -PathType Container) -and -not (Test-WithinRoot $PlanRoot)) {
|
||||
Write-Error "Error: planning directory is outside the project or cannot be verified."
|
||||
exit 1
|
||||
}
|
||||
if (Test-WithinRoot $PlanRoot) { $current = Get-CurrentActivePlan }
|
||||
if ($current) {
|
||||
$planDir = Join-Path $PlanRoot $current
|
||||
if ($current -ne "" -and (Test-Path $planDir)) {
|
||||
if ((Test-Path -LiteralPath $planDir -PathType Container) -and (Test-WithinRoot $planDir)) {
|
||||
Write-Output "Active plan: $current"
|
||||
Write-Output "Path: $planDir"
|
||||
} elseif ($current -ne "") {
|
||||
Write-Output "Active plan pointer: $current (directory not found - stale pointer)"
|
||||
} else {
|
||||
Write-Output "No active plan set."
|
||||
Write-Output "Active plan pointer: $current (directory not found or outside project - stale pointer)"
|
||||
}
|
||||
} else {
|
||||
Write-Output "No active plan set."
|
||||
@@ -29,21 +247,53 @@ if ($PlanId -eq "") {
|
||||
exit 0
|
||||
}
|
||||
|
||||
if (-not (Test-ValidSlug $PlanId)) {
|
||||
Write-Error "Error: invalid plan ID. Use letters, numbers, underscores, dots, or hyphens; start with a letter, number, or underscore."
|
||||
exit 1
|
||||
}
|
||||
$PlanDir = Join-Path $PlanRoot $PlanId
|
||||
|
||||
if (-not (Test-Path $PlanDir)) {
|
||||
if (-not (Test-Path -LiteralPath $PlanDir -PathType Container)) {
|
||||
Write-Error "Error: plan directory not found: $PlanDir"
|
||||
Write-Error "Run: init-session.sh `"$PlanId`" to create it, or check .planning\ for available plans."
|
||||
exit 1
|
||||
}
|
||||
|
||||
if (-not (Test-Path $PlanRoot)) {
|
||||
New-Item -ItemType Directory -Path $PlanRoot -Force | Out-Null
|
||||
if (-not (Test-WithinRoot $PlanRoot) -or -not (Test-WithinRoot $PlanDir)) {
|
||||
Write-Error "Error: plan directory must remain within the project."
|
||||
exit 1
|
||||
}
|
||||
$activeItem = Get-Item -LiteralPath $ActiveFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not (Test-SafeActiveFile)) {
|
||||
Write-Error "Error: the active plan pointer must be a regular file within the project."
|
||||
exit 1
|
||||
}
|
||||
|
||||
$utf8NoBom = New-Object System.Text.UTF8Encoding($false)
|
||||
[System.IO.File]::WriteAllText($ActiveFile, $PlanId, $utf8NoBom)
|
||||
|
||||
# Replace the directory entry instead of truncating an existing inode: a
|
||||
# hardlinked pointer must not overwrite another file. The exclusive temporary
|
||||
# file lives beside the pointer, keeping replacement on the same filesystem.
|
||||
$tempFile = Join-Path $PlanRoot ('.active_plan.' + [guid]::NewGuid().ToString('N') + '.tmp')
|
||||
$createdTemp = $false
|
||||
try {
|
||||
$stream = [IO.File]::Open($tempFile, [IO.FileMode]::CreateNew, [IO.FileAccess]::Write, [IO.FileShare]::None)
|
||||
$createdTemp = $true
|
||||
try {
|
||||
$bytes = $utf8NoBom.GetBytes($PlanId)
|
||||
$stream.Write($bytes, 0, $bytes.Length)
|
||||
$stream.Flush()
|
||||
} finally { $stream.Dispose() }
|
||||
if ($activeItem) {
|
||||
[IO.File]::Replace($tempFile, $ActiveFile, [NullString]::Value)
|
||||
} else {
|
||||
[IO.File]::Move($tempFile, $ActiveFile)
|
||||
}
|
||||
} catch {
|
||||
Write-Error "Error: could not set the active plan pointer: $($_.Exception.Message)"
|
||||
exit 1
|
||||
} finally {
|
||||
if ($createdTemp -and (Test-Path -LiteralPath $tempFile)) {
|
||||
Remove-Item -LiteralPath $tempFile -Force -ErrorAction SilentlyContinue
|
||||
}
|
||||
}
|
||||
Write-Output "Active plan set to: $PlanId"
|
||||
Write-Output "Path: $PlanDir"
|
||||
Write-Output ""
|
||||
|
||||
Regular → Executable
+323
-38
@@ -1,50 +1,335 @@
|
||||
#!/bin/sh
|
||||
# planning-with-files: set or display the active plan pointer.
|
||||
#
|
||||
# Usage:
|
||||
# set-active-plan.sh <plan_id> — pin .planning/.active_plan to plan_id
|
||||
# set-active-plan.sh — print the current active plan (if any)
|
||||
#
|
||||
# The active plan is stored in .planning/.active_plan and is read by
|
||||
# resolve-plan-dir.sh when no $PLAN_ID env var is set.
|
||||
|
||||
set -e
|
||||
|
||||
# List saved named plans, show the shared pointer, or change that pointer.
|
||||
# Usage: set-active-plan.sh [--list|-l|PLAN_ID]
|
||||
# Operates on the current project; listing never binds a host or injects data.
|
||||
set -eu
|
||||
PLAN_ROOT="${PWD}/.planning"
|
||||
ACTIVE_FILE="${PLAN_ROOT}/.active_plan"
|
||||
PWF_ROOT_PIN=""
|
||||
|
||||
# No args → show current active plan
|
||||
if [ "${1:-}" = "" ]; then
|
||||
if [ -f "${ACTIVE_FILE}" ]; then
|
||||
plan_id="$(tr -d '\r\n' < "${ACTIVE_FILE}")"
|
||||
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ]; then
|
||||
echo "Active plan: ${plan_id}"
|
||||
echo "Path: ${PLAN_ROOT}/${plan_id}"
|
||||
elif [ -n "${plan_id}" ]; then
|
||||
echo "Active plan pointer: ${plan_id} (directory not found — stale pointer)"
|
||||
else
|
||||
echo "No active plan set."
|
||||
fi
|
||||
# Use the resolver canonicalization policy without running plan selection.
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Pure-sh backslash-to-forward-slash normalizer; result lands in $NORM_OUT.
|
||||
# Windows-native coreutils builds (e.g. C:\Program Files\coreutils on PATH
|
||||
# ahead of Git's usr/bin) canonicalize MSYS-style /c/... input to C:\-style
|
||||
# backslash output. The containment prefix match below is written with forward
|
||||
# slashes, so without this normalization every canonical pair mismatches and
|
||||
# resolution silently fails. On POSIX systems paths contain no backslash and
|
||||
# this is the identity. A literal backslash in a Unix filename normalizes to
|
||||
# "/" and at worst fails containment — the safe direction. No subshell, no
|
||||
# fork: plain parameter expansion in a loop.
|
||||
norm_slashes() {
|
||||
NORM_OUT=""
|
||||
_ns_rest="$1"
|
||||
while :; do
|
||||
case "${_ns_rest}" in
|
||||
*\\*)
|
||||
NORM_OUT="${NORM_OUT}${_ns_rest%%\\*}/"
|
||||
_ns_rest="${_ns_rest#*\\}"
|
||||
;;
|
||||
*)
|
||||
NORM_OUT="${NORM_OUT}${_ns_rest}"
|
||||
break
|
||||
;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
out="$(realpath "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v readlink >/dev/null 2>&1; then
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -I -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment guard (security A1.3): a resolved plan dir must canonicalize to a
|
||||
# path under the project root (the CWD the script runs from). A symlink inside
|
||||
# a valid slug dir pointing at /etc or outside the workspace would otherwise let
|
||||
# the hooks hash and inject an arbitrary file. On any violation we return 1 so
|
||||
# the caller treats the candidate as unresolved and falls back safely.
|
||||
#
|
||||
# The root canonicalizes via the relative token "." rather than the $PWD
|
||||
# string. On some Windows/MSYS setups (8.3 short names, the /tmp mount alias)
|
||||
# realpath("$PWD") and realpath(relative-candidate) resolve through different
|
||||
# code paths and land on differently-spelled-but-equal targets, so the prefix
|
||||
# match below fails and resolution silently goes dark. "." resolves through
|
||||
# the same physical-cwd path candidates already use (same fix inject-plan.sh
|
||||
# received earlier; the resolver kept the $PWD form until now). Both sides are
|
||||
# backslash-normalized before comparison for Windows-native canonicalizers.
|
||||
# The root is computed once per run: the newest-mtime scan calls this guard
|
||||
# per plan dir, and each canonicalize costs a process spawn on Windows.
|
||||
#
|
||||
# With a PWF_PLAN_ROOT pin (issue #212) containment is checked against THAT
|
||||
# root instead of the cwd: candidates arrive ${PWF_PLAN_ROOT}/-prefixed, so
|
||||
# both sides canonicalize through the same path spelling. Unpinned keeps the
|
||||
# relative "." root — byte-identical to the legacy check.
|
||||
ROOT_REAL=""
|
||||
ROOT_REAL_SET=0
|
||||
is_within_root() {
|
||||
candidate="$1"
|
||||
if [ "${ROOT_REAL_SET}" = "0" ]; then
|
||||
ROOT_REAL="$(canonicalize "${PWF_ROOT_PIN:-.}")" || ROOT_REAL=""
|
||||
norm_slashes "${ROOT_REAL}"
|
||||
ROOT_REAL="${NORM_OUT}"
|
||||
ROOT_REAL_SET=1
|
||||
fi
|
||||
# Canonicalize the candidate through its cwd-RELATIVE form whenever it
|
||||
# lives under ${PWD}. The candidate string is built from ${PWD} (an MSYS
|
||||
# long-form spelling), while the root canonicalizes from "." (the process
|
||||
# cwd, which a caller may have set with an 8.3 short-form string). A
|
||||
# Windows-native realpath does not unify those spellings, so canonicalizing
|
||||
# both sides from the same cwd base is the only spelling-stable comparison.
|
||||
# The emitted result keeps the original absolute candidate — only the
|
||||
# containment check uses the relative form.
|
||||
# Pinned resolution skips the rewrite: candidate and root then share the
|
||||
# ${PWF_PLAN_ROOT} spelling, so both canonicalize directly from it.
|
||||
if [ -n "${PWF_ROOT_PIN}" ]; then
|
||||
check_target="${candidate}"
|
||||
else
|
||||
echo "No active plan set."
|
||||
case "${candidate}" in
|
||||
"${PWD}"/*) check_target=".${candidate#"${PWD}"}" ;;
|
||||
*) check_target="${candidate}" ;;
|
||||
esac
|
||||
fi
|
||||
cand_real="$(canonicalize "${check_target}")" || cand_real=""
|
||||
norm_slashes "${cand_real}"
|
||||
cand_real="${NORM_OUT}"
|
||||
if [ -z "${ROOT_REAL}" ] || [ -z "${cand_real}" ]; then
|
||||
# Slug validation blocks textual traversal, but only successful
|
||||
# canonicalization can rule out a symlink/junction escape.
|
||||
return 1
|
||||
fi
|
||||
case "${cand_real}" in
|
||||
"${ROOT_REAL}"|"${ROOT_REAL}"/*) return 0 ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Each phase contributes at most one status. An explicit Status line wins
|
||||
# over an inline heading marker. Fenced examples and unrelated sections are
|
||||
# not phases. Keep this parser aligned with the PowerShell helper.
|
||||
phase_status() {
|
||||
awk '
|
||||
function finish() {
|
||||
if (phase) {
|
||||
status = primary != "" ? primary : inline_status
|
||||
if (status == "complete") complete++
|
||||
else if (status == "in_progress") in_progress++
|
||||
else if (status == "pending") pending++
|
||||
}
|
||||
phase = 0; primary = ""; inline_status = ""
|
||||
}
|
||||
{
|
||||
line = $0
|
||||
sub(/\r$/, "", line)
|
||||
trimmed = line
|
||||
sub(/^ */, "", trimmed)
|
||||
if (line ~ /^ ? ? ?```/ || line ~ /^ ? ? ?~~~/) {
|
||||
marker = substr(trimmed, 1, 1)
|
||||
run = 0
|
||||
while (substr(trimmed, run + 1, 1) == marker) run++
|
||||
if (fence == "") { fence = marker; fence_length = run }
|
||||
else if (marker == fence && run >= fence_length && substr(trimmed, run + 1) ~ /^[ \t]*$/) fence = ""
|
||||
next
|
||||
}
|
||||
if (fence != "") next
|
||||
if (line ~ /^ ? ? ?###[ \t]+(Phase|Fase|المرحلة|阶段|階段)[ \t]+[0-9]+([^0-9A-Za-z_]|$)/) {
|
||||
finish(); phase = 1; total++
|
||||
if (match(line, /\[(complete|in_progress|pending)\]/))
|
||||
inline_status = substr(line, RSTART + 1, RLENGTH - 2)
|
||||
} else if (line ~ /^ ? ? ?(###|##|#)([ \t]|$)/) {
|
||||
finish()
|
||||
} else if (phase && primary == "" && line ~ /^ ? ? ?(-[ \t]+)?\*\*(Status:|Estado:|الحالة:|状态:|狀態:)\*\*[ \t]+(complete|in_progress|pending)([ \t]|$)/) {
|
||||
sub(/^ ? ? ?(-[ \t]+)?\*\*(Status:|Estado:|الحالة:|状态:|狀態:)\*\*[ \t]+/, "", line)
|
||||
sub(/[ \t].*$/, "", line)
|
||||
primary = line
|
||||
}
|
||||
}
|
||||
END {
|
||||
finish()
|
||||
printf "%d/%d complete, %d in_progress, %d pending", complete, total, in_progress, pending
|
||||
}
|
||||
' < "$1"
|
||||
}
|
||||
|
||||
current_active() {
|
||||
if [ -f "${ACTIVE_FILE}" ] && is_within_root "${ACTIVE_FILE}"; then
|
||||
_current="$(tr '\r' '\n' < "${ACTIVE_FILE}")"
|
||||
# Windows editors and older PowerShell defaults can leave a UTF-8 BOM.
|
||||
# Treat it as an encoding marker, not part of the shared plan slug.
|
||||
_utf8_bom="$(printf '\357\273\277')"
|
||||
case "${_current}" in
|
||||
"${_utf8_bom}"*) _current="${_current#"${_utf8_bom}"}" ;;
|
||||
esac
|
||||
slug_is_valid "${_current}" && printf '%s\n' "${_current}"
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
list_plans() {
|
||||
if [ ! -d "${PLAN_ROOT}" ]; then
|
||||
printf '%s\n' 'No planning directory found.'
|
||||
return 0
|
||||
fi
|
||||
if ! is_within_root "${PLAN_ROOT}"; then
|
||||
printf '%s\n' 'Error: planning directory is outside the project or cannot be verified.' >&2
|
||||
return 1
|
||||
fi
|
||||
_active="$(current_active)"
|
||||
_found=0
|
||||
printf '%s\n' 'Available plans:'
|
||||
for _dir in "${PLAN_ROOT}"/*; do
|
||||
[ -d "${_dir}" ] || continue
|
||||
_id="${_dir##*/}"
|
||||
slug_is_valid "${_id}" || continue
|
||||
is_within_root "${_dir}" || continue
|
||||
_plan_file="${_dir}/task_plan.md"
|
||||
[ -f "${_plan_file}" ] && [ -r "${_plan_file}" ] || continue
|
||||
is_within_root "${_plan_file}" || continue
|
||||
_status="$(phase_status "${_plan_file}")" || continue
|
||||
_marker=''
|
||||
if [ "${_id}" = "${_active}" ]; then _marker=' [active]'; fi
|
||||
printf '%s\n' "- ${_id}${_marker} - ${_status}"
|
||||
_found=1
|
||||
done
|
||||
if [ "${_found}" -eq 0 ]; then
|
||||
printf '%s\n' 'No named plans found.'
|
||||
else
|
||||
printf '%s\n' '[active] marks the shared default pointer. Set PLAN_ID to pin a session.'
|
||||
fi
|
||||
}
|
||||
|
||||
if [ "$#" -gt 1 ]; then
|
||||
printf '%s\n' 'Error: list plans or set PLAN_ID in separate calls.' >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
case "${1:-}" in
|
||||
--list|-l) list_plans; exit $? ;;
|
||||
--help|-h)
|
||||
printf '%s\n' 'Usage: set-active-plan.sh [--list|PLAN_ID]' \
|
||||
'Lists saved named plans in the current project without selecting a plan.'
|
||||
exit 0 ;;
|
||||
esac
|
||||
|
||||
if [ "${1:-}" = '' ]; then
|
||||
if [ -d "${PLAN_ROOT}" ] && ! is_within_root "${PLAN_ROOT}"; then
|
||||
printf '%s\n' 'Error: planning directory is outside the project or cannot be verified.' >&2
|
||||
exit 1
|
||||
fi
|
||||
plan_id="$(current_active)"
|
||||
if [ -n "${plan_id}" ] && [ -d "${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)"
|
||||
else
|
||||
printf '%s\n' 'No active plan set.'
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
|
||||
PLAN_ID="$1"
|
||||
PLAN_DIR="${PLAN_ROOT}/${PLAN_ID}"
|
||||
|
||||
if [ ! -d "${PLAN_DIR}" ]; then
|
||||
echo "Error: plan directory not found: ${PLAN_DIR}" >&2
|
||||
echo "Run: init-session.sh \"${PLAN_ID}\" to create it, or check .planning/ for available plans." >&2
|
||||
if ! slug_is_valid "${PLAN_ID}"; then
|
||||
printf '%s\n' 'Error: invalid plan ID. Use a named directory under .planning.' >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mkdir -p "${PLAN_ROOT}"
|
||||
printf "%s\n" "${PLAN_ID}" > "${ACTIVE_FILE}"
|
||||
|
||||
echo "Active plan set to: ${PLAN_ID}"
|
||||
echo "Path: ${PLAN_DIR}"
|
||||
echo ""
|
||||
echo "To pin this terminal session only:"
|
||||
echo " export PLAN_ID=${PLAN_ID}"
|
||||
PLAN_DIR="${PLAN_ROOT}/${PLAN_ID}"
|
||||
if [ ! -d "${PLAN_DIR}" ]; then
|
||||
printf '%s\n' "Error: plan directory not found: ${PLAN_DIR}" \
|
||||
"Run: init-session.sh \"${PLAN_ID}\" to create it, or use --list to see available plans." >&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
|
||||
fi
|
||||
# A pre-existing pointer must itself be a contained regular file before writing.
|
||||
if { [ -e "${ACTIVE_FILE}" ] || [ -L "${ACTIVE_FILE}" ]; } &&
|
||||
{ [ -L "${ACTIVE_FILE}" ] || [ ! -f "${ACTIVE_FILE}" ] || ! is_within_root "${ACTIVE_FILE}"; }; then
|
||||
printf '%s\n' 'Error: active plan pointer is not a safe file inside the project.' >&2
|
||||
exit 1
|
||||
fi
|
||||
# Replace the pointer atomically instead of truncating a possible hardlink.
|
||||
# mktemp creates a private, exclusive file beside the destination.
|
||||
temp_file="$(mktemp "${PLAN_ROOT}/.active_plan.XXXXXX")" || {
|
||||
printf '%s\n' 'Error: could not create the active plan pointer.' >&2
|
||||
exit 1
|
||||
}
|
||||
trap 'rm -f "${temp_file}"' EXIT
|
||||
trap 'exit 1' HUP INT TERM
|
||||
printf '%s\n' "${PLAN_ID}" > "${temp_file}"
|
||||
if ! mv -f "${temp_file}" "${ACTIVE_FILE}"; then
|
||||
printf '%s\n' 'Error: could not replace the active plan pointer.' >&2
|
||||
exit 1
|
||||
fi
|
||||
trap - EXIT HUP INT TERM
|
||||
printf '%s\n' "Active plan set to: ${PLAN_ID}" "Path: ${PLAN_DIR}" '' \
|
||||
'To pin this terminal session only:' " export PLAN_ID=${PLAN_ID}"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "planning-with-files",
|
||||
"version": "3.17.0",
|
||||
"version": "3.18.2",
|
||||
"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",
|
||||
@@ -8,6 +8,7 @@
|
||||
},
|
||||
"repository": "https://github.com/OthmanAdi/planning-with-files",
|
||||
"license": "MIT",
|
||||
"commands": [],
|
||||
"skills": "./.agents/skills/",
|
||||
"hooks": "./hooks/codex-hooks.json"
|
||||
}
|
||||
|
||||
@@ -17,8 +17,8 @@ HOOK_DIR = Path(__file__).resolve().parent
|
||||
_SAFE_LEGACY_SESSION_ID = re.compile(r"[A-Za-z0-9][A-Za-z0-9._-]{0,127}\Z")
|
||||
_PLAN_SLUG = re.compile(r"[A-Za-z0-9_][A-Za-z0-9._-]*\Z")
|
||||
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."
|
||||
"[planning-with-files] Multiple plans are available. "
|
||||
"Set PLAN_ID=<slug> for this session; nothing injected."
|
||||
)
|
||||
_DARWIN_SYSTEM_ALIASES = {
|
||||
Path("/var"): Path("/private/var"),
|
||||
@@ -223,23 +223,21 @@ def session_plan_requires_binding(root: Path) -> bool:
|
||||
"""Require PLAN_ID when an attached session can resolve multiple plans.
|
||||
|
||||
Session sentinels admit a session to planning context. They do not select a
|
||||
plan. Once isolation is armed, an unbound session may use legacy resolution
|
||||
only when the effective root has at most one live plan candidate.
|
||||
plan. Multiple named plans always require a pin. With isolation armed,
|
||||
a legacy root plan also counts as a competing candidate.
|
||||
"""
|
||||
if os.environ.get("PLAN_ID", ""):
|
||||
return False
|
||||
|
||||
sessions_dir = root / ".planning" / "sessions"
|
||||
try:
|
||||
sessions_info = sessions_dir.lstat()
|
||||
if _is_reparse_or_link(sessions_dir) or not stat.S_ISDIR(sessions_info.st_mode):
|
||||
return False
|
||||
except (FileNotFoundError, OSError, RuntimeError):
|
||||
armed = sessions_dir.exists() or sessions_dir.is_symlink()
|
||||
planning_dir = root / ".planning"
|
||||
if not planning_dir.exists():
|
||||
return False
|
||||
|
||||
candidates = 0
|
||||
try:
|
||||
if (root / "task_plan.md").is_file():
|
||||
if armed and (root / "task_plan.md").is_file():
|
||||
candidates += 1
|
||||
planning_dir = root / ".planning"
|
||||
for child in planning_dir.iterdir():
|
||||
|
||||
@@ -6,6 +6,9 @@
|
||||
|
||||
HOOK_DIR="$(cd "$(dirname "$0")" 2>/dev/null && pwd)"
|
||||
PLAN_DIR="$(sh "${HOOK_DIR}/resolve-plan-dir.sh" 2>/dev/null)"
|
||||
if [ -z "$PLAN_DIR" ] && [ "$(sh "${HOOK_DIR}/resolve-plan-dir.sh" --check-ambiguity 2>/dev/null)" = "PWF_PLAN_AMBIGUOUS_V1" ]; then
|
||||
exit 0
|
||||
fi
|
||||
# An explicit PLAN_ID is a binding, not a hint (issue #237). When the shared
|
||||
# resolver rejected one it emits nothing, and the legacy-root fallback below
|
||||
# would answer for a plan the operator never named. Stay silent instead; the
|
||||
|
||||
@@ -7,6 +7,9 @@
|
||||
|
||||
HOOK_DIR="$(cd "$(dirname "$0")" 2>/dev/null && pwd)"
|
||||
PLAN_DIR="$(sh "${HOOK_DIR}/resolve-plan-dir.sh" 2>/dev/null)"
|
||||
if [ -z "$PLAN_DIR" ] && [ "$(sh "${HOOK_DIR}/resolve-plan-dir.sh" --check-ambiguity 2>/dev/null)" = "PWF_PLAN_AMBIGUOUS_V1" ]; then
|
||||
exit 0
|
||||
fi
|
||||
# An explicit PLAN_ID is a binding, not a hint (issue #237). When the shared
|
||||
# resolver rejected one it emits nothing, and the legacy-root fallback below
|
||||
# would carry the wrong plan through compaction, which is the one moment the
|
||||
|
||||
@@ -10,6 +10,9 @@ fi
|
||||
|
||||
HOOK_DIR="$(cd "$(dirname "$0")" 2>/dev/null && pwd)"
|
||||
PLAN_DIR="$(sh "${HOOK_DIR}/resolve-plan-dir.sh" 2>/dev/null)"
|
||||
if [ -z "$PLAN_DIR" ] && [ "$(sh "${HOOK_DIR}/resolve-plan-dir.sh" --check-ambiguity 2>/dev/null)" = "PWF_PLAN_AMBIGUOUS_V1" ]; then
|
||||
exit 0
|
||||
fi
|
||||
# An explicit PLAN_ID is a binding, not a hint (issue #237). When the shared
|
||||
# resolver rejected one it emits nothing, and the legacy-root fallback below
|
||||
# would recite a plan the operator never named on every tool call. Stay silent
|
||||
@@ -34,10 +37,10 @@ if [ -f "$PLAN_FILE" ]; then
|
||||
if [ -n "$PWF_PYTHON" ] && [ -f "$PWF_PYTHON" ] && [ -f "${HOOK_DIR}/context_frame.py" ]; then
|
||||
if [ -n "$PLAN_DIR" ]; then ATTEST_FILE="${PLAN_DIR}/.attestation"; else ATTEST_FILE=".plan-attestation"; fi
|
||||
if [ -n "$PLAN_DIR" ]; then MODE_FILE="${PLAN_DIR}/.mode"; else MODE_FILE=".mode"; fi
|
||||
PWF_MODE=$("$PWF_PYTHON" -c 'import sys; from pathlib import Path; sys.path.insert(0, sys.argv[1]); import context_frame as c; raw=c.read_optional_regular_bytes(Path(sys.argv[2]), max_source_bytes=256); tokens=[] if raw is None else raw.decode("ascii", errors="strict").split(); allowed={"autonomous", "gate", "inject-smart"}; print("unsafe" if any(t not in allowed for t in tokens) else ("gated" if "gate" in tokens else ("autonomous" if "autonomous" in tokens else "legacy")))' "$HOOK_DIR" "$MODE_FILE" 2>/dev/null) || PWF_MODE="unsafe"
|
||||
PWF_MODE=$("$PWF_PYTHON" -I -X utf8 -c 'import sys; from pathlib import Path; sys.path.insert(0, sys.argv[1]); import context_frame as c; raw=c.read_optional_regular_bytes(Path(sys.argv[2]), max_source_bytes=256); tokens=[] if raw is None else raw.decode("ascii", errors="strict").split(); allowed={"autonomous", "gate", "inject-smart"}; print("unsafe" if any(t not in allowed for t in tokens) else ("gated" if "gate" in tokens else ("autonomous" if "autonomous" in tokens else "legacy")))' "$HOOK_DIR" "$MODE_FILE" 2>/dev/null) || PWF_MODE="unsafe"
|
||||
case "$PWF_MODE" in
|
||||
autonomous|gated) echo '{"decision": "allow"}'; exit 0 ;;
|
||||
legacy) "$PWF_PYTHON" "${HOOK_DIR}/context_frame.py" plan "$PLAN_FILE" --head 30 --attestation "$ATTEST_FILE" --mode "$MODE_FILE" >&2 ;;
|
||||
legacy) "$PWF_PYTHON" -I -X utf8 "${HOOK_DIR}/context_frame.py" plan "$PLAN_FILE" --head 30 --attestation "$ATTEST_FILE" --mode "$MODE_FILE" >&2 ;;
|
||||
*) : ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
@@ -12,7 +12,7 @@ SKILL_DIR="$CODEX_ROOT/skills/planning-with-files"
|
||||
PYTHON_BIN="${PYTHON_BIN:-$(command -v python3 || command -v python)}"
|
||||
|
||||
if [ -n "$PYTHON_BIN" ] && [ -f "$SKILL_DIR/scripts/session-catchup.py" ]; then
|
||||
"$PYTHON_BIN" "$SKILL_DIR/scripts/session-catchup.py" --no-history "$(pwd)"
|
||||
"$PYTHON_BIN" -I -X utf8 "$SKILL_DIR/scripts/session-catchup.py" --no-history "$(pwd)"
|
||||
fi
|
||||
|
||||
sh "$SCRIPT_DIR/user-prompt-submit.sh"
|
||||
|
||||
@@ -6,6 +6,9 @@
|
||||
|
||||
HOOK_DIR="$(cd "$(dirname "$0")" 2>/dev/null && pwd)"
|
||||
PLAN_DIR="$(sh "${HOOK_DIR}/resolve-plan-dir.sh" 2>/dev/null)"
|
||||
if [ -z "$PLAN_DIR" ] && [ "$(sh "${HOOK_DIR}/resolve-plan-dir.sh" --check-ambiguity 2>/dev/null)" = "PWF_PLAN_AMBIGUOUS_V1" ]; then
|
||||
exit 0
|
||||
fi
|
||||
# An explicit PLAN_ID is a binding, not a hint (issue #237). When the shared
|
||||
# resolver rejected one it emits nothing, and the legacy-root fallback below
|
||||
# would decide whether this run may stop from a plan the operator never named.
|
||||
|
||||
@@ -23,7 +23,7 @@ validate_python_candidate() {
|
||||
case "$_tp_lower" in
|
||||
*/microsoft/windowsapps/*) return 1 ;;
|
||||
esac
|
||||
"$_tp_candidate" -c 'import sys' >/dev/null 2>&1 || return 1
|
||||
"$_tp_candidate" -I -X utf8 -c 'import sys' >/dev/null 2>&1 || return 1
|
||||
printf '%s\n' "$_tp_candidate"
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ if [ -n "${PWF_PLAN_ROOT:-}" ]; then
|
||||
esac
|
||||
PIN_PYTHON="$(trusted_python explicit 2>/dev/null)" || PIN_PYTHON=""
|
||||
[ -n "$PIN_PYTHON" ] || { echo "[planning-with-files] PWF_PLAN_ROOT could not be validated; nothing injected."; exit 0; }
|
||||
PIN_REAL=$("$PIN_PYTHON" -c 'import sys; from pathlib import Path; sys.path.insert(0, sys.argv[1]); import codex_hook_adapter as a; root=a.effective_plan_root(Path.cwd()); print(root or "")' "$HOOK_DIR" 2>/dev/null) || PIN_REAL=""
|
||||
PIN_REAL=$("$PIN_PYTHON" -I -X utf8 -c 'import sys; from pathlib import Path; sys.path.insert(0, sys.argv[1]); import codex_hook_adapter as a; root=a.effective_plan_root(Path.cwd()); print(root or "")' "$HOOK_DIR" 2>/dev/null) || PIN_REAL=""
|
||||
[ -n "$PIN_REAL" ] || { echo "[planning-with-files] PWF_PLAN_ROOT must stay within the current workspace; nothing injected."; exit 0; }
|
||||
if [ -n "$PIN_REAL" ] && [ -d "$PIN_REAL" ]; then
|
||||
PWF_PLAN_ROOT="$PIN_REAL"
|
||||
@@ -76,6 +76,10 @@ fi
|
||||
# Resolve and confirm a contained plan before probing or executing any Python
|
||||
# candidate. No-plan hook fires remain shell-only and silent.
|
||||
PLAN_DIR="$(sh "${HOOK_DIR}/resolve-plan-dir.sh" 2>/dev/null)"
|
||||
PLAN_AMBIGUOUS=0
|
||||
if [ -z "$PLAN_DIR" ] && [ "$(sh "${HOOK_DIR}/resolve-plan-dir.sh" --check-ambiguity 2>/dev/null)" = "PWF_PLAN_AMBIGUOUS_V1" ]; then
|
||||
PLAN_AMBIGUOUS=1
|
||||
fi
|
||||
if [ -n "$PLAN_DIR" ]; then
|
||||
PLAN_FILE="${PLAN_DIR}/task_plan.md"
|
||||
PROGRESS_FILE="${PLAN_DIR}/progress.md"
|
||||
@@ -92,7 +96,7 @@ else
|
||||
PLAN_FILE="${PLAN_PREFIX}task_plan.md"
|
||||
PROGRESS_FILE="${PLAN_PREFIX}progress.md"
|
||||
fi
|
||||
[ -f "$PLAN_FILE" ] || exit 0
|
||||
[ -f "$PLAN_FILE" ] || [ "$PLAN_AMBIGUOUS" = "1" ] || exit 0
|
||||
|
||||
# --- Re-arm the once-per-turn PostToolUse nudge (issue #239). ---
|
||||
# One user message is one turn, and this hook fires once per turn, so clearing
|
||||
@@ -113,7 +117,7 @@ elif [ -n "${HOME:-}" ]; then
|
||||
else
|
||||
TURN_ROOT="${TMPDIR:-/tmp}/pwf-turn"
|
||||
fi
|
||||
if [ -d "$TURN_ROOT" ]; then
|
||||
if [ "$PLAN_AMBIGUOUS" = "0" ] && [ -d "$TURN_ROOT" ]; then
|
||||
case "$TURN_PLAN_FILE" in
|
||||
/*|[A-Za-z]:*|\\\\*) TURN_KEY_SRC="$TURN_PLAN_FILE" ;;
|
||||
*) TURN_KEY_SRC="${PWD}/${TURN_PLAN_FILE}" ;;
|
||||
@@ -141,7 +145,7 @@ else
|
||||
if [ -z "$PWF_PYTHON" ]; then
|
||||
PWF_SESSION_ADMISSION="refused"
|
||||
else
|
||||
PWF_SESSION_ADMISSION=$("$PWF_PYTHON" -c 'import sys; from pathlib import Path; sys.path.insert(0, sys.argv[1]); import codex_hook_adapter as a; root=a.effective_plan_root(Path.cwd());
|
||||
PWF_SESSION_ADMISSION=$("$PWF_PYTHON" -I -X utf8 -c 'import sys; from pathlib import Path; sys.path.insert(0, sys.argv[1]); import codex_hook_adapter as a; root=a.effective_plan_root(Path.cwd());
|
||||
if root is None: print("refused")
|
||||
else:
|
||||
try: (root / ".planning" / "sessions").lstat(); armed=True
|
||||
@@ -160,6 +164,11 @@ case "$PWF_SESSION_ADMISSION" in
|
||||
;;
|
||||
esac
|
||||
|
||||
if [ "$PLAN_AMBIGUOUS" = "1" ]; then
|
||||
echo "[planning-with-files] Multiple plans are available. Set PLAN_ID=<slug> for this session; nothing injected."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Plan-id safe-identifier check. Pure-sh case patterns; shared shape with
|
||||
# resolve-plan-dir.sh, needed below to decide whether PLAN_ID named the plan.
|
||||
slug_is_valid() {
|
||||
@@ -244,13 +253,13 @@ if [ -f "$PLAN_FILE" ]; then
|
||||
if [ -z "$PWF_PYTHON" ] || [ ! -f "${HOOK_DIR}/context_frame.py" ]; then exit 0; fi
|
||||
if [ -n "$PLAN_DIR" ]; then ATTEST_FILE="${PLAN_DIR}/.attestation"; else ATTEST_FILE="${PLAN_PREFIX}.plan-attestation"; fi
|
||||
if [ -n "$PLAN_DIR" ]; then MODE_FILE="${PLAN_DIR}/.mode"; else MODE_FILE="${PLAN_PREFIX}.mode"; fi
|
||||
PLAN_CONTEXT=$("$PWF_PYTHON" "${HOOK_DIR}/context_frame.py" plan "$PLAN_FILE" --head 50 --attestation "$ATTEST_FILE" --mode "$MODE_FILE" 2>&1)
|
||||
PLAN_CONTEXT=$("$PWF_PYTHON" -I -X utf8 "${HOOK_DIR}/context_frame.py" plan "$PLAN_FILE" --head 50 --attestation "$ATTEST_FILE" --mode "$MODE_FILE" 2>&1)
|
||||
if [ $? -ne 0 ]; then printf '%s\n' "$PLAN_CONTEXT"; exit 0; fi
|
||||
echo "[planning-with-files] ACTIVE PLAN — current state:"
|
||||
printf '%s\n' "$PLAN_CONTEXT"
|
||||
echo ""
|
||||
if [ -f "$PROGRESS_FILE" ]; then
|
||||
PROGRESS_CONTEXT=$("$PWF_PYTHON" "${HOOK_DIR}/context_frame.py" progress "$PROGRESS_FILE" --tail 20 2>&1)
|
||||
PROGRESS_CONTEXT=$("$PWF_PYTHON" -I -X utf8 "${HOOK_DIR}/context_frame.py" progress "$PROGRESS_FILE" --tail 20 2>&1)
|
||||
[ $? -eq 0 ] && printf '%s\n' "$PROGRESS_CONTEXT"
|
||||
fi
|
||||
echo ""
|
||||
|
||||
@@ -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.17.0"
|
||||
version: "3.18.2"
|
||||
|
||||
---
|
||||
|
||||
@@ -46,7 +46,7 @@ Work like Manus: Use persistent markdown files as your "working memory on disk."
|
||||
|
||||
## FIRST: Restore Project State
|
||||
|
||||
**Before continuing**, resolve the plan this task owns. Use the installed `scripts/resolve-plan-dir.sh` (or `.ps1`) with the host's `PLAN_ID` and `PWF_PLAN_ROOT`, then read `task_plan.md`, `progress.md`, and `findings.md` from that selected directory. If an explicit selector is rejected, or session isolation is armed with multiple plans and no `PLAN_ID`, correct the pin and do not fall back to another task. Run `git diff --stat` for code changes not yet recorded there. All planning filenames below mean that selected directory. For parallel tasks, pin each host before it starts or use separate worktrees; a child process export does not change its host. One orchestrator owns a shared plan and summaries, while workers use assigned files or ledgers.
|
||||
**Before continuing**, resolve the plan this task owns. Use the installed `scripts/resolve-plan-dir.sh` (or `.ps1`) with the host's `PLAN_ID` and `PWF_PLAN_ROOT`, then read `task_plan.md`, `progress.md`, and `findings.md` from that selected directory. If an explicit selector is rejected, or multiple named plans exist without `PLAN_ID`, correct the pin and do not fall back to another task. Run `git diff --stat` for code changes not yet recorded there. All planning filenames below mean that selected directory. For parallel tasks, pin each host before it starts or use separate worktrees; a child process export does not change its host. One orchestrator owns a shared plan and summaries, while workers use assigned files or ledgers.
|
||||
|
||||
```bash
|
||||
# Linux/macOS (auto-detects python3 or python)
|
||||
@@ -212,6 +212,12 @@ Helper scripts for automation:
|
||||
- `scripts/check-complete.sh` — Verify all phases complete
|
||||
- `scripts/session-catchup.py`: Explicit same-project session-record aggregation or bounded replay (`--metadata` / `--replay`); bare invocation does not access host history
|
||||
|
||||
### List saved plans
|
||||
|
||||
To find a task before resuming it, run `sh "<skill-dir>/scripts/set-active-plan.sh" --list` or, in Windows PowerShell, `& "<skill-dir>/scripts/set-active-plan.ps1" -List`. Replace `<skill-dir>` with this installed skill directory and keep your current directory at the project root.
|
||||
|
||||
This read-only command lists named plans and phase progress under the current directory's `.planning/`. `[active]` marks the shared default pointer; it does not bind a session. Concurrent tasks still require each host's `PLAN_ID` or separate worktrees.
|
||||
|
||||
## Advanced Topics
|
||||
|
||||
- **Manus Principles:** See [references/reference.md](references/reference.md)
|
||||
|
||||
@@ -404,6 +404,7 @@ function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
$resolvedDir = @(& $resolver | Where-Object { $_ }) | Select-Object -First 1
|
||||
if (-not $resolvedDir -and ((& $resolver -CheckAmbiguity) -eq "PWF_PLAN_AMBIGUOUS_V1")) { return $null }
|
||||
if ($resolvedDir) {
|
||||
$planFile = Join-Path $resolvedDir "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $planFile -ExpectedDirectory $resolvedDir)
|
||||
|
||||
@@ -45,6 +45,10 @@ resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
plan_dir="$(sh "${RESOLVER}" 2>/dev/null)"
|
||||
if [ -z "$plan_dir" ] && [ "$(sh "${RESOLVER}" --check-ambiguity 2>/dev/null)" = "PWF_PLAN_AMBIGUOUS_V1" ]; then
|
||||
printf "[plan-attest] Multiple plans are available. Set PLAN_ID=<slug>; nothing was attested.\n" >&2
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
if [ -n "${plan_dir}" ] && [ -f "${plan_dir}/task_plan.md" ]; then
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
|
||||
@@ -35,6 +35,7 @@ if ($PlanFile -ne "") {
|
||||
try {
|
||||
$resolvedDir = (& $resolver 2>$null | Select-Object -First 1)
|
||||
if ($null -eq $resolvedDir) { $resolvedDir = "" }
|
||||
if (-not $resolvedDir -and ((& $resolver -CheckAmbiguity) -eq "PWF_PLAN_AMBIGUOUS_V1")) { exit 0 }
|
||||
} catch {
|
||||
$resolvedDir = ""
|
||||
}
|
||||
|
||||
@@ -56,6 +56,9 @@ else
|
||||
RESOLVED_DIR=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
RESOLVED_DIR="$(sh "${RESOLVER}" 2>/dev/null)"
|
||||
if [ -z "$RESOLVED_DIR" ] && [ "$(sh "${RESOLVER}" --check-ambiguity 2>/dev/null)" = "PWF_PLAN_AMBIGUOUS_V1" ]; then
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
if [ -n "${RESOLVED_DIR}" ] && [ -f "${RESOLVED_DIR}/task_plan.md" ]; then
|
||||
PLAN_FILE="${RESOLVED_DIR}/task_plan.md"
|
||||
|
||||
@@ -59,12 +59,9 @@ Windows runs the shell chain through Git Bash and nothing else:
|
||||
one turn-marker slot and one progress-guard slot per plan.
|
||||
|
||||
Known, accepted differences from the shell reference:
|
||||
* Two plan directories with the same whole-second mtime, no .active_plan
|
||||
and no PLAN_ID: the reference picks the first in the shell's glob order
|
||||
(locale collation), this twin the first in code-point order. The same
|
||||
collation difference can change which three of four or more nested
|
||||
projects the ambiguity notice names. A machine runs one implementation,
|
||||
so neither choice flips within a session.
|
||||
* Shell glob order follows locale collation; this twin uses code-point
|
||||
order. This can change which three of four or more nested projects the
|
||||
ambiguity notice names.
|
||||
* BSD sed (macOS) appends a newline to a progress.md whose last line has
|
||||
none; GNU sed and this twin do not.
|
||||
* With PWF_PLAN_ROOT set under Git Bash the shell sees the pin as typed
|
||||
@@ -837,6 +834,16 @@ class Injector(object):
|
||||
scope = ""
|
||||
explicit = bool(plan_prefix)
|
||||
plan_id = env.get("PLAN_ID", "")
|
||||
ambiguous = plan_is_ambiguous(
|
||||
plan_prefix + ".planning", plan_root_pin if plan_root_pin else ".", plan_id
|
||||
)
|
||||
if ambiguous and (context == "preflight" or not is_dir(plan_prefix + ".planning/sessions")):
|
||||
if context == "userprompt":
|
||||
self.echo(
|
||||
"[planning-with-files] Multiple plans are available. Set PLAN_ID=<slug> "
|
||||
"for this session; nothing injected."
|
||||
)
|
||||
raise Bail()
|
||||
if plan_id:
|
||||
if slug_is_valid(plan_id) and is_dir(plan_prefix + ".planning/" + plan_id):
|
||||
resolved = plan_prefix + ".planning/" + plan_id
|
||||
@@ -923,30 +930,14 @@ class Injector(object):
|
||||
"single-session mode."
|
||||
)
|
||||
raise Bail()
|
||||
if not plan_id:
|
||||
plan_n = 1 if is_file(plan_prefix + "task_plan.md") else 0
|
||||
try:
|
||||
names = sorted(os.listdir(plan_prefix + ".planning"))
|
||||
except OSError:
|
||||
names = []
|
||||
for name in names:
|
||||
if name.startswith("."):
|
||||
continue
|
||||
if not is_file(plan_prefix + ".planning/" + name + "/task_plan.md"):
|
||||
continue
|
||||
if not slug_is_valid(name):
|
||||
continue
|
||||
plan_n += 1
|
||||
if plan_n > 1:
|
||||
break
|
||||
if plan_n > 1:
|
||||
if context == "userprompt":
|
||||
self.echo(
|
||||
"[planning-with-files] Multiple plans are available while session "
|
||||
"isolation is armed. Set PLAN_ID=<slug> for this session; nothing "
|
||||
"injected."
|
||||
)
|
||||
raise Bail()
|
||||
if ambiguous:
|
||||
if context == "userprompt":
|
||||
self.echo(
|
||||
"[planning-with-files] Multiple plans are available while session "
|
||||
"isolation is armed. Set PLAN_ID=<slug> for this session; nothing "
|
||||
"injected."
|
||||
)
|
||||
raise Bail()
|
||||
|
||||
if not explicit:
|
||||
nested = []
|
||||
@@ -1326,6 +1317,23 @@ def inject(context, env=None):
|
||||
# Twin of resolve-plan-dir.sh (the shared resolver the dispatcher uses).
|
||||
# --------------------------------------------------------------------------
|
||||
|
||||
def plan_is_ambiguous(plan_root, project_root, plan_id=""):
|
||||
"""A project pointer or mtime cannot bind a session to multiple plans."""
|
||||
if plan_id:
|
||||
return False
|
||||
count = 1 if is_dir(plan_root + "/sessions") and is_file(project_root + "/task_plan.md") else 0
|
||||
try:
|
||||
names = os.listdir(plan_root)
|
||||
except OSError:
|
||||
names = []
|
||||
for name in names:
|
||||
if slug_is_valid(name) and is_file(plan_root + "/" + name + "/task_plan.md"):
|
||||
count += 1
|
||||
if count > 1:
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
def resolve_plan_dir(env=None):
|
||||
"""Return (spelled, filesystem) paths of the plan directory, or ("", "").
|
||||
|
||||
@@ -1360,6 +1368,9 @@ def resolve_plan_dir(env=None):
|
||||
return found(plan_id)
|
||||
return ("", "")
|
||||
|
||||
if plan_is_ambiguous(fs_root, pin if pin else "."):
|
||||
return ("", "")
|
||||
|
||||
active_file = fs_root + "/.active_plan"
|
||||
if is_file(active_file):
|
||||
try:
|
||||
@@ -1441,6 +1452,8 @@ class ClaudeDispatcher(object):
|
||||
return (spelled, fs)
|
||||
if self.env.get("PLAN_ID", "") or self.env.get("PWF_PLAN_ROOT", ""):
|
||||
return ("", "")
|
||||
if plan_is_ambiguous(".planning", "."):
|
||||
return ("", "")
|
||||
if is_file("task_plan.md"):
|
||||
return (".", ".")
|
||||
return ("", "")
|
||||
|
||||
@@ -254,6 +254,29 @@ is_within_root() {
|
||||
# The .active_plan pointer, the newest-by-mtime fallback, and the legacy root
|
||||
# task_plan.md are cwd GUESSES — only guesses are subject to the nested-root
|
||||
# conflict check below.
|
||||
# Shared .active_plan and directory mtime cannot identify this session's plan.
|
||||
# Check before selection or preflight, even when isolation was never armed.
|
||||
PLAN_AMBIGUOUS=0
|
||||
if [ -z "${PLAN_ID:-}" ]; then
|
||||
PLAN_COUNT=0
|
||||
if [ -d "${PLAN_PREFIX}.planning/sessions" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; 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}"
|
||||
slug_is_valid "${plan_candidate_dir##*/}" || continue
|
||||
PLAN_COUNT=$((PLAN_COUNT + 1))
|
||||
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
|
||||
done
|
||||
fi
|
||||
if [ "$PLAN_AMBIGUOUS" = "1" ] && { [ "$CONTEXT" = "preflight" ] || [ ! -d "${PLAN_PREFIX}.planning/sessions" ]; }; then
|
||||
if [ "$CONTEXT" = "userprompt" ]; then
|
||||
echo "[planning-with-files] Multiple plans are available. Set PLAN_ID=<slug> for this session; nothing injected."
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
|
||||
RESOLVED=""
|
||||
SCOPE=""
|
||||
EXPLICIT=0
|
||||
@@ -442,27 +465,13 @@ PY
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# An attachment admits a session but does not select one of several plans.
|
||||
# When isolation is armed, require PLAN_ID if more than one live same-root
|
||||
# candidate exists. PWF_PLAN_ROOT selects the project root, not a plan
|
||||
# within that root.
|
||||
if [ -z "${PLAN_ID:-}" ]; then
|
||||
SESSION_PLAN_N=0
|
||||
[ -f "${PLAN_PREFIX}task_plan.md" ] && SESSION_PLAN_N=1
|
||||
for candidate in "${PLAN_PREFIX}".planning/*/task_plan.md; do
|
||||
[ -f "$candidate" ] || continue
|
||||
candidate_dir="${candidate%/task_plan.md}"
|
||||
candidate_slug="${candidate_dir##*/}"
|
||||
slug_is_valid "$candidate_slug" || continue
|
||||
SESSION_PLAN_N=$((SESSION_PLAN_N + 1))
|
||||
[ "$SESSION_PLAN_N" -gt 1 ] && break
|
||||
done
|
||||
if [ "$SESSION_PLAN_N" -gt 1 ]; then
|
||||
if [ "$CONTEXT" = "userprompt" ]; then
|
||||
echo "[planning-with-files] Multiple plans are available while session isolation is armed. Set PLAN_ID=<slug> for this session; nothing injected."
|
||||
fi
|
||||
exit 0
|
||||
# Attachment admits a session but does not select its plan. Preserve the
|
||||
# attachment-first notice above for sessions that never opted in.
|
||||
if [ "$PLAN_AMBIGUOUS" = "1" ]; then
|
||||
if [ "$CONTEXT" = "userprompt" ]; then
|
||||
echo "[planning-with-files] Multiple plans are available while session isolation is armed. Set PLAN_ID=<slug> for this session; nothing injected."
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@@ -13,7 +13,8 @@
|
||||
# junction/symlink escape; slug validation alone blocks textual traversal.
|
||||
|
||||
param(
|
||||
[string]$PlanRoot = (Join-Path (Get-Location) ".planning")
|
||||
[string]$PlanRoot = (Join-Path (Get-Location) ".planning"),
|
||||
[switch]$CheckAmbiguity
|
||||
)
|
||||
|
||||
$projectRoot = (Get-Location).Path
|
||||
@@ -137,6 +138,30 @@ $activeFile = Join-Path $PlanRoot ".active_plan"
|
||||
# at rc=0. Emptiness is the fail-closed signal on this channel, matching
|
||||
# resolve-plan-dir.sh and the PWF_PLAN_ROOT pin. An empty $env:PLAN_ID is
|
||||
# falsy here and still means "unset".
|
||||
# The optional probe distinguishes ambiguity from a legacy-root fallback.
|
||||
# Multiple named plans require PLAN_ID even without a sessions directory.
|
||||
$planCount = 0
|
||||
if (-not $env:PLAN_ID) {
|
||||
if ((Test-Path -LiteralPath (Join-Path $PlanRoot "sessions") -PathType Container) -and
|
||||
(Test-Path -LiteralPath (Join-Path $projectRoot "task_plan.md") -PathType Leaf)) {
|
||||
$planCount = 1
|
||||
}
|
||||
if (Test-Path -LiteralPath $PlanRoot -PathType Container) {
|
||||
foreach ($entry in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue)) {
|
||||
if ((Test-ValidSlug $entry.Name) -and
|
||||
(Test-Path -LiteralPath (Join-Path $entry.FullName "task_plan.md") -PathType Leaf)) {
|
||||
$planCount++
|
||||
if ($planCount -gt 1) { break }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($CheckAmbiguity) {
|
||||
if ($planCount -gt 1) { Write-Output "PWF_PLAN_AMBIGUOUS_V1" }
|
||||
exit 0
|
||||
}
|
||||
if ($planCount -gt 1) { exit 0 }
|
||||
|
||||
if ($env:PLAN_ID) {
|
||||
if (Test-ValidSlug $env:PLAN_ID) {
|
||||
$candidate = Join-Path $PlanRoot $env:PLAN_ID
|
||||
|
||||
@@ -15,6 +15,13 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Optional probe distinguishes ambiguity from the empty legacy-root result.
|
||||
# Both modes keep stdout data-only and always exit zero.
|
||||
CHECK_AMBIGUITY=0
|
||||
if [ "${1:-}" = "--check-ambiguity" ]; then
|
||||
CHECK_AMBIGUITY=1
|
||||
shift
|
||||
fi
|
||||
PLAN_ROOT="${1:-${PWD}/.planning}"
|
||||
|
||||
# --- PWF_PLAN_ROOT: absolute plan-root binding (issue #212). ---
|
||||
@@ -321,6 +328,29 @@ resolve_latest_dir() {
|
||||
# the fail-closed signal on this channel, exactly as the PWF_PLAN_ROOT guard
|
||||
# above already does it; a non-zero status would kill callers running under
|
||||
# set -e for a condition that is not an internal error.
|
||||
# A shared pointer or mtime is not a per-session binding (issue #240).
|
||||
# Count conservatively, just like injection: slug-valid live plan files.
|
||||
# The legacy root joins the count only when session isolation is armed.
|
||||
PLAN_AMBIGUOUS=0
|
||||
if [ -z "${PLAN_ID:-}" ]; then
|
||||
PLAN_COUNT=0
|
||||
if [ -d "${PLAN_ROOT}/sessions" ] && [ -f "${PWF_ROOT_PIN:-.}/task_plan.md" ]; 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}"
|
||||
slug_is_valid "${plan_candidate_dir##*/}" || continue
|
||||
PLAN_COUNT=$((PLAN_COUNT + 1))
|
||||
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
|
||||
done
|
||||
fi
|
||||
if [ "$CHECK_AMBIGUITY" = "1" ]; then
|
||||
[ "$PLAN_AMBIGUOUS" = "1" ] && printf '%s\n' 'PWF_PLAN_AMBIGUOUS_V1'
|
||||
exit 0
|
||||
fi
|
||||
[ "$PLAN_AMBIGUOUS" = "1" ] && exit 0
|
||||
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
resolve_from_env && exit 0
|
||||
exit 0
|
||||
|
||||
Regular → Executable
+266
-16
@@ -1,27 +1,245 @@
|
||||
# planning-with-files: set or display the active plan pointer (PowerShell).
|
||||
# planning-with-files: set, display, or list the active plan pointer (PowerShell).
|
||||
#
|
||||
# Usage:
|
||||
# .\set-active-plan.ps1 <plan_id> - pin .planning\.active_plan to plan_id
|
||||
# .\set-active-plan.ps1 - print the current active plan (if any)
|
||||
# .\set-active-plan.ps1 -List - list available named plans and phase counts
|
||||
# .\set-active-plan.ps1 --list - equivalent to -List and -l
|
||||
|
||||
param(
|
||||
[string]$PlanId = ""
|
||||
[Parameter(Position = 0)]
|
||||
[string]$PlanId = "",
|
||||
[Alias('l', '-list')]
|
||||
[switch]$List,
|
||||
[Alias('h', '-help')]
|
||||
[switch]$Help
|
||||
)
|
||||
|
||||
$PlanRoot = Join-Path (Get-Location) ".planning"
|
||||
$ProjectRoot = (Get-Location).Path
|
||||
# Windows PowerShell 5.1 can silently change directories when -File inherits
|
||||
# a cwd containing wildcard characters. Recover that physical cwd only for a
|
||||
# direct invocation of this script; interactive Set-Location remains primary.
|
||||
if ($PSVersionTable.PSVersion.Major -eq 5 -and
|
||||
[System.Management.Automation.WildcardPattern]::ContainsWildcardCharacters([Environment]::CurrentDirectory)) {
|
||||
$processArgs = [Environment]::GetCommandLineArgs()
|
||||
for ($index = 0; $index -lt ($processArgs.Length - 1); $index++) {
|
||||
if ($processArgs[$index] -ieq '-File') {
|
||||
$entryScript = $processArgs[$index + 1]
|
||||
if (-not [IO.Path]::IsPathRooted($entryScript)) {
|
||||
$entryScript = Join-Path ([Environment]::CurrentDirectory) $entryScript
|
||||
}
|
||||
if ([IO.Path]::GetFullPath($entryScript) -eq [IO.Path]::GetFullPath($PSCommandPath)) {
|
||||
$ProjectRoot = [Environment]::CurrentDirectory
|
||||
}
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
$PlanRoot = Join-Path $ProjectRoot ".planning"
|
||||
$ActiveFile = Join-Path $PlanRoot ".active_plan"
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
|
||||
# Resolve-Path can retain a junction's spelling. Like resolve-plan-dir.ps1,
|
||||
# open the actual filesystem object before checking the project boundary.
|
||||
# The Windows handle supports both directories and task_plan.md files.
|
||||
function Get-FinalPath {
|
||||
param([string]$Path)
|
||||
if (-not ("PwfPlanListingNative" -as [type])) {
|
||||
Add-Type -ErrorAction Stop -TypeDefinition @'
|
||||
using System;
|
||||
using System.ComponentModel;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
using Microsoft.Win32.SafeHandles;
|
||||
|
||||
public static class PwfPlanListingNative {
|
||||
[DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
|
||||
private static extern SafeFileHandle CreateFileW(
|
||||
string name, uint access, uint share, IntPtr security,
|
||||
uint creation, uint flags, IntPtr template);
|
||||
[DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
|
||||
private static extern uint GetFinalPathNameByHandleW(
|
||||
SafeFileHandle handle, StringBuilder path, uint length, uint flags);
|
||||
[DllImport("libc", SetLastError = true)]
|
||||
private static extern IntPtr realpath(string path, IntPtr resolved);
|
||||
[DllImport("libc")]
|
||||
private static extern void free(IntPtr pointer);
|
||||
|
||||
public static string FinalPath(string path) {
|
||||
if (Environment.OSVersion.Platform != PlatformID.Win32NT) {
|
||||
IntPtr resolved = realpath(path, IntPtr.Zero);
|
||||
if (resolved == IntPtr.Zero) throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
try { return Marshal.PtrToStringAnsi(resolved); }
|
||||
finally { free(resolved); }
|
||||
}
|
||||
// OPEN_EXISTING, FILE_SHARE_READ | WRITE | DELETE, BACKUP_SEMANTICS.
|
||||
using (SafeFileHandle handle = CreateFileW(
|
||||
path, 0, 7, IntPtr.Zero, 3, 0x02000000, IntPtr.Zero)) {
|
||||
if (handle.IsInvalid) throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
StringBuilder buffer = new StringBuilder(32768);
|
||||
uint length = GetFinalPathNameByHandleW(handle, buffer, (uint)buffer.Capacity, 0);
|
||||
if (length == 0 || length >= buffer.Capacity)
|
||||
throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
string result = buffer.ToString();
|
||||
if (result.StartsWith(@"\\?\UNC\", StringComparison.OrdinalIgnoreCase))
|
||||
return @"\\" + result.Substring(8);
|
||||
if (result.StartsWith(@"\\?\", StringComparison.OrdinalIgnoreCase))
|
||||
return result.Substring(4);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
'@
|
||||
}
|
||||
return [PwfPlanListingNative]::FinalPath($Path)
|
||||
}
|
||||
|
||||
function Test-WithinRoot {
|
||||
param([string]$Path)
|
||||
try {
|
||||
$rootReal = (Get-FinalPath $ProjectRoot).TrimEnd('\', '/')
|
||||
$pathReal = (Get-FinalPath $Path).TrimEnd('\', '/')
|
||||
$comparison = [StringComparison]::Ordinal
|
||||
if ($script:IsWindowsHost) { $comparison = [StringComparison]::OrdinalIgnoreCase }
|
||||
return $pathReal.Equals($rootReal, $comparison) -or
|
||||
$pathReal.StartsWith($rootReal + [IO.Path]::DirectorySeparatorChar, $comparison)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
}
|
||||
|
||||
function Test-ValidSlug {
|
||||
param([string]$Name)
|
||||
return $Name -cmatch '^[A-Za-z0-9_][A-Za-z0-9._-]*\z'
|
||||
}
|
||||
|
||||
function Test-SafeActiveFile {
|
||||
param([switch]$AllowLink)
|
||||
$item = Get-Item -LiteralPath $ActiveFile -Force -ErrorAction SilentlyContinue
|
||||
if (-not $item) { return $false }
|
||||
# Reading may follow a verified in-project link; writing must not.
|
||||
return -not $item.PSIsContainer -and
|
||||
($AllowLink -or (($item.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) -and
|
||||
(Test-WithinRoot $ActiveFile)
|
||||
}
|
||||
|
||||
function Get-CurrentActivePlan {
|
||||
if (-not (Test-SafeActiveFile -AllowLink)) { return "" }
|
||||
try {
|
||||
$current = ([string](Get-Content -LiteralPath $ActiveFile -Raw -Encoding UTF8 -ErrorAction Stop)).Trim([char[]]"`r`n")
|
||||
if (Test-ValidSlug $current) { return $current }
|
||||
} catch { }
|
||||
return ""
|
||||
}
|
||||
|
||||
function Add-PhaseStatus {
|
||||
param([hashtable]$Counts, $Phase)
|
||||
if ($null -eq $Phase) { return }
|
||||
$status = $Phase.Inline
|
||||
if ($Phase.Primary) { $status = $Phase.Primary }
|
||||
if ($status) { $Counts[$status]++ }
|
||||
}
|
||||
|
||||
function Get-PhaseStatus {
|
||||
param([string]$PlanFile)
|
||||
$counts = @{ total = 0; complete = 0; in_progress = 0; pending = 0 }
|
||||
$phase = $null
|
||||
$fence = ""
|
||||
$fenceLength = 0
|
||||
# The shipped translations keep status identifiers in English. Unicode
|
||||
# escapes preserve Windows PowerShell 5.1 compatibility without a BOM.
|
||||
$phaseLabel = '(?:Phase|Fase|\u0627\u0644\u0645\u0631\u062d\u0644\u0629|\u9636\u6bb5|\u968e\u6bb5)'
|
||||
$statusLabel = '(?:Status:|Estado:|\u0627\u0644\u062d\u0627\u0644\u0629:|\u72b6\u6001\uff1a|\u72c0\u614b\uff1a)'
|
||||
# Read once; an empty file is a valid plan with zero phases.
|
||||
$content = [string](Get-Content -LiteralPath $PlanFile -Raw -Encoding UTF8 -ErrorAction Stop)
|
||||
foreach ($line in ($content -split '\r?\n')) {
|
||||
if ($fence) {
|
||||
$closing = '^ {0,3}' + [regex]::Escape($fence) + '{' + $fenceLength + ',}[ \t]*$'
|
||||
if ($line -match $closing) { $fence = "" }
|
||||
continue
|
||||
}
|
||||
if ($line -match '^ {0,3}(`{3,}|~{3,})') {
|
||||
$fence = $Matches[1].Substring(0, 1)
|
||||
$fenceLength = $Matches[1].Length
|
||||
continue
|
||||
}
|
||||
if ($line -cmatch ('^ {0,3}###[ \t]+' + $phaseLabel + '[ \t]+[0-9]+(?:[^0-9A-Za-z_]|$)')) {
|
||||
Add-PhaseStatus $counts $phase
|
||||
$phase = @{ Primary = ""; Inline = "" }
|
||||
$counts.total++
|
||||
if ($line -cmatch '\[(complete|in_progress|pending)\]') {
|
||||
$phase.Inline = $Matches[1]
|
||||
}
|
||||
continue
|
||||
}
|
||||
if ($line -match '^ {0,3}#{1,3}(?:[ \t]+|$)') {
|
||||
Add-PhaseStatus $counts $phase
|
||||
$phase = $null
|
||||
continue
|
||||
}
|
||||
if ($null -ne $phase -and -not $phase.Primary -and
|
||||
$line -cmatch ('^ {0,3}(?:-[ \t]+)?\*\*' + $statusLabel + '\*\*[ \t]+(complete|in_progress|pending)(?:[ \t]|$)')) {
|
||||
$phase.Primary = $Matches[1]
|
||||
}
|
||||
}
|
||||
Add-PhaseStatus $counts $phase
|
||||
return "$($counts.complete)/$($counts.total) complete, $($counts.in_progress) in_progress, $($counts.pending) pending"
|
||||
}
|
||||
|
||||
function Show-PlanList {
|
||||
if (-not (Test-Path -LiteralPath $PlanRoot -PathType Container)) {
|
||||
Write-Output "No planning directory found."
|
||||
return
|
||||
}
|
||||
if (-not (Test-WithinRoot $PlanRoot)) {
|
||||
Write-Error "Error: planning directory is outside the project or cannot be verified."
|
||||
exit 1
|
||||
}
|
||||
$active = Get-CurrentActivePlan
|
||||
Write-Output "Available plans:"
|
||||
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)) {
|
||||
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 }
|
||||
try { $status = Get-PhaseStatus $planFile } catch { continue }
|
||||
$marker = ""
|
||||
if ($plan.Name -ceq $active) { $marker = " [active]" }
|
||||
Write-Output "- $($plan.Name)$marker - $status"
|
||||
$found = $true
|
||||
}
|
||||
if (-not $found) { Write-Output "No named plans found." }
|
||||
}
|
||||
|
||||
if ($Help -or $PlanId -eq "--help" -or $PlanId -eq "-h") {
|
||||
Write-Output "Usage: set-active-plan.ps1 [-List|-l|--list|PLAN_ID]"
|
||||
exit 0
|
||||
}
|
||||
|
||||
if ($List -or $PlanId -eq "--list" -or $PlanId -eq "-l") {
|
||||
if ($List -and $PlanId) {
|
||||
Write-Error "Error: list plans or set PLAN_ID in separate calls."
|
||||
exit 1
|
||||
}
|
||||
Show-PlanList
|
||||
exit 0
|
||||
}
|
||||
|
||||
if ($PlanId -eq "") {
|
||||
if (Test-Path $ActiveFile) {
|
||||
$current = (Get-Content $ActiveFile -Raw -Encoding UTF8).Trim()
|
||||
$current = ""
|
||||
if ((Test-Path -LiteralPath $PlanRoot -PathType Container) -and -not (Test-WithinRoot $PlanRoot)) {
|
||||
Write-Error "Error: planning directory is outside the project or cannot be verified."
|
||||
exit 1
|
||||
}
|
||||
if (Test-WithinRoot $PlanRoot) { $current = Get-CurrentActivePlan }
|
||||
if ($current) {
|
||||
$planDir = Join-Path $PlanRoot $current
|
||||
if ($current -ne "" -and (Test-Path $planDir)) {
|
||||
if ((Test-Path -LiteralPath $planDir -PathType Container) -and (Test-WithinRoot $planDir)) {
|
||||
Write-Output "Active plan: $current"
|
||||
Write-Output "Path: $planDir"
|
||||
} elseif ($current -ne "") {
|
||||
Write-Output "Active plan pointer: $current (directory not found - stale pointer)"
|
||||
} else {
|
||||
Write-Output "No active plan set."
|
||||
Write-Output "Active plan pointer: $current (directory not found or outside project - stale pointer)"
|
||||
}
|
||||
} else {
|
||||
Write-Output "No active plan set."
|
||||
@@ -29,21 +247,53 @@ if ($PlanId -eq "") {
|
||||
exit 0
|
||||
}
|
||||
|
||||
if (-not (Test-ValidSlug $PlanId)) {
|
||||
Write-Error "Error: invalid plan ID. Use letters, numbers, underscores, dots, or hyphens; start with a letter, number, or underscore."
|
||||
exit 1
|
||||
}
|
||||
$PlanDir = Join-Path $PlanRoot $PlanId
|
||||
|
||||
if (-not (Test-Path $PlanDir)) {
|
||||
if (-not (Test-Path -LiteralPath $PlanDir -PathType Container)) {
|
||||
Write-Error "Error: plan directory not found: $PlanDir"
|
||||
Write-Error "Run: init-session.sh `"$PlanId`" to create it, or check .planning\ for available plans."
|
||||
exit 1
|
||||
}
|
||||
|
||||
if (-not (Test-Path $PlanRoot)) {
|
||||
New-Item -ItemType Directory -Path $PlanRoot -Force | Out-Null
|
||||
if (-not (Test-WithinRoot $PlanRoot) -or -not (Test-WithinRoot $PlanDir)) {
|
||||
Write-Error "Error: plan directory must remain within the project."
|
||||
exit 1
|
||||
}
|
||||
$activeItem = Get-Item -LiteralPath $ActiveFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not (Test-SafeActiveFile)) {
|
||||
Write-Error "Error: the active plan pointer must be a regular file within the project."
|
||||
exit 1
|
||||
}
|
||||
|
||||
$utf8NoBom = New-Object System.Text.UTF8Encoding($false)
|
||||
[System.IO.File]::WriteAllText($ActiveFile, $PlanId, $utf8NoBom)
|
||||
|
||||
# Replace the directory entry instead of truncating an existing inode: a
|
||||
# hardlinked pointer must not overwrite another file. The exclusive temporary
|
||||
# file lives beside the pointer, keeping replacement on the same filesystem.
|
||||
$tempFile = Join-Path $PlanRoot ('.active_plan.' + [guid]::NewGuid().ToString('N') + '.tmp')
|
||||
$createdTemp = $false
|
||||
try {
|
||||
$stream = [IO.File]::Open($tempFile, [IO.FileMode]::CreateNew, [IO.FileAccess]::Write, [IO.FileShare]::None)
|
||||
$createdTemp = $true
|
||||
try {
|
||||
$bytes = $utf8NoBom.GetBytes($PlanId)
|
||||
$stream.Write($bytes, 0, $bytes.Length)
|
||||
$stream.Flush()
|
||||
} finally { $stream.Dispose() }
|
||||
if ($activeItem) {
|
||||
[IO.File]::Replace($tempFile, $ActiveFile, [NullString]::Value)
|
||||
} else {
|
||||
[IO.File]::Move($tempFile, $ActiveFile)
|
||||
}
|
||||
} catch {
|
||||
Write-Error "Error: could not set the active plan pointer: $($_.Exception.Message)"
|
||||
exit 1
|
||||
} finally {
|
||||
if ($createdTemp -and (Test-Path -LiteralPath $tempFile)) {
|
||||
Remove-Item -LiteralPath $tempFile -Force -ErrorAction SilentlyContinue
|
||||
}
|
||||
}
|
||||
Write-Output "Active plan set to: $PlanId"
|
||||
Write-Output "Path: $PlanDir"
|
||||
Write-Output ""
|
||||
|
||||
Regular → Executable
+323
-38
@@ -1,50 +1,335 @@
|
||||
#!/bin/sh
|
||||
# planning-with-files: set or display the active plan pointer.
|
||||
#
|
||||
# Usage:
|
||||
# set-active-plan.sh <plan_id> — pin .planning/.active_plan to plan_id
|
||||
# set-active-plan.sh — print the current active plan (if any)
|
||||
#
|
||||
# The active plan is stored in .planning/.active_plan and is read by
|
||||
# resolve-plan-dir.sh when no $PLAN_ID env var is set.
|
||||
|
||||
set -e
|
||||
|
||||
# List saved named plans, show the shared pointer, or change that pointer.
|
||||
# Usage: set-active-plan.sh [--list|-l|PLAN_ID]
|
||||
# Operates on the current project; listing never binds a host or injects data.
|
||||
set -eu
|
||||
PLAN_ROOT="${PWD}/.planning"
|
||||
ACTIVE_FILE="${PLAN_ROOT}/.active_plan"
|
||||
PWF_ROOT_PIN=""
|
||||
|
||||
# No args → show current active plan
|
||||
if [ "${1:-}" = "" ]; then
|
||||
if [ -f "${ACTIVE_FILE}" ]; then
|
||||
plan_id="$(tr -d '\r\n' < "${ACTIVE_FILE}")"
|
||||
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ]; then
|
||||
echo "Active plan: ${plan_id}"
|
||||
echo "Path: ${PLAN_ROOT}/${plan_id}"
|
||||
elif [ -n "${plan_id}" ]; then
|
||||
echo "Active plan pointer: ${plan_id} (directory not found — stale pointer)"
|
||||
else
|
||||
echo "No active plan set."
|
||||
fi
|
||||
# Use the resolver canonicalization policy without running plan selection.
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Pure-sh backslash-to-forward-slash normalizer; result lands in $NORM_OUT.
|
||||
# Windows-native coreutils builds (e.g. C:\Program Files\coreutils on PATH
|
||||
# ahead of Git's usr/bin) canonicalize MSYS-style /c/... input to C:\-style
|
||||
# backslash output. The containment prefix match below is written with forward
|
||||
# slashes, so without this normalization every canonical pair mismatches and
|
||||
# resolution silently fails. On POSIX systems paths contain no backslash and
|
||||
# this is the identity. A literal backslash in a Unix filename normalizes to
|
||||
# "/" and at worst fails containment — the safe direction. No subshell, no
|
||||
# fork: plain parameter expansion in a loop.
|
||||
norm_slashes() {
|
||||
NORM_OUT=""
|
||||
_ns_rest="$1"
|
||||
while :; do
|
||||
case "${_ns_rest}" in
|
||||
*\\*)
|
||||
NORM_OUT="${NORM_OUT}${_ns_rest%%\\*}/"
|
||||
_ns_rest="${_ns_rest#*\\}"
|
||||
;;
|
||||
*)
|
||||
NORM_OUT="${NORM_OUT}${_ns_rest}"
|
||||
break
|
||||
;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
out="$(realpath "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v readlink >/dev/null 2>&1; then
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -I -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment guard (security A1.3): a resolved plan dir must canonicalize to a
|
||||
# path under the project root (the CWD the script runs from). A symlink inside
|
||||
# a valid slug dir pointing at /etc or outside the workspace would otherwise let
|
||||
# the hooks hash and inject an arbitrary file. On any violation we return 1 so
|
||||
# the caller treats the candidate as unresolved and falls back safely.
|
||||
#
|
||||
# The root canonicalizes via the relative token "." rather than the $PWD
|
||||
# string. On some Windows/MSYS setups (8.3 short names, the /tmp mount alias)
|
||||
# realpath("$PWD") and realpath(relative-candidate) resolve through different
|
||||
# code paths and land on differently-spelled-but-equal targets, so the prefix
|
||||
# match below fails and resolution silently goes dark. "." resolves through
|
||||
# the same physical-cwd path candidates already use (same fix inject-plan.sh
|
||||
# received earlier; the resolver kept the $PWD form until now). Both sides are
|
||||
# backslash-normalized before comparison for Windows-native canonicalizers.
|
||||
# The root is computed once per run: the newest-mtime scan calls this guard
|
||||
# per plan dir, and each canonicalize costs a process spawn on Windows.
|
||||
#
|
||||
# With a PWF_PLAN_ROOT pin (issue #212) containment is checked against THAT
|
||||
# root instead of the cwd: candidates arrive ${PWF_PLAN_ROOT}/-prefixed, so
|
||||
# both sides canonicalize through the same path spelling. Unpinned keeps the
|
||||
# relative "." root — byte-identical to the legacy check.
|
||||
ROOT_REAL=""
|
||||
ROOT_REAL_SET=0
|
||||
is_within_root() {
|
||||
candidate="$1"
|
||||
if [ "${ROOT_REAL_SET}" = "0" ]; then
|
||||
ROOT_REAL="$(canonicalize "${PWF_ROOT_PIN:-.}")" || ROOT_REAL=""
|
||||
norm_slashes "${ROOT_REAL}"
|
||||
ROOT_REAL="${NORM_OUT}"
|
||||
ROOT_REAL_SET=1
|
||||
fi
|
||||
# Canonicalize the candidate through its cwd-RELATIVE form whenever it
|
||||
# lives under ${PWD}. The candidate string is built from ${PWD} (an MSYS
|
||||
# long-form spelling), while the root canonicalizes from "." (the process
|
||||
# cwd, which a caller may have set with an 8.3 short-form string). A
|
||||
# Windows-native realpath does not unify those spellings, so canonicalizing
|
||||
# both sides from the same cwd base is the only spelling-stable comparison.
|
||||
# The emitted result keeps the original absolute candidate — only the
|
||||
# containment check uses the relative form.
|
||||
# Pinned resolution skips the rewrite: candidate and root then share the
|
||||
# ${PWF_PLAN_ROOT} spelling, so both canonicalize directly from it.
|
||||
if [ -n "${PWF_ROOT_PIN}" ]; then
|
||||
check_target="${candidate}"
|
||||
else
|
||||
echo "No active plan set."
|
||||
case "${candidate}" in
|
||||
"${PWD}"/*) check_target=".${candidate#"${PWD}"}" ;;
|
||||
*) check_target="${candidate}" ;;
|
||||
esac
|
||||
fi
|
||||
cand_real="$(canonicalize "${check_target}")" || cand_real=""
|
||||
norm_slashes "${cand_real}"
|
||||
cand_real="${NORM_OUT}"
|
||||
if [ -z "${ROOT_REAL}" ] || [ -z "${cand_real}" ]; then
|
||||
# Slug validation blocks textual traversal, but only successful
|
||||
# canonicalization can rule out a symlink/junction escape.
|
||||
return 1
|
||||
fi
|
||||
case "${cand_real}" in
|
||||
"${ROOT_REAL}"|"${ROOT_REAL}"/*) return 0 ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Each phase contributes at most one status. An explicit Status line wins
|
||||
# over an inline heading marker. Fenced examples and unrelated sections are
|
||||
# not phases. Keep this parser aligned with the PowerShell helper.
|
||||
phase_status() {
|
||||
awk '
|
||||
function finish() {
|
||||
if (phase) {
|
||||
status = primary != "" ? primary : inline_status
|
||||
if (status == "complete") complete++
|
||||
else if (status == "in_progress") in_progress++
|
||||
else if (status == "pending") pending++
|
||||
}
|
||||
phase = 0; primary = ""; inline_status = ""
|
||||
}
|
||||
{
|
||||
line = $0
|
||||
sub(/\r$/, "", line)
|
||||
trimmed = line
|
||||
sub(/^ */, "", trimmed)
|
||||
if (line ~ /^ ? ? ?```/ || line ~ /^ ? ? ?~~~/) {
|
||||
marker = substr(trimmed, 1, 1)
|
||||
run = 0
|
||||
while (substr(trimmed, run + 1, 1) == marker) run++
|
||||
if (fence == "") { fence = marker; fence_length = run }
|
||||
else if (marker == fence && run >= fence_length && substr(trimmed, run + 1) ~ /^[ \t]*$/) fence = ""
|
||||
next
|
||||
}
|
||||
if (fence != "") next
|
||||
if (line ~ /^ ? ? ?###[ \t]+(Phase|Fase|المرحلة|阶段|階段)[ \t]+[0-9]+([^0-9A-Za-z_]|$)/) {
|
||||
finish(); phase = 1; total++
|
||||
if (match(line, /\[(complete|in_progress|pending)\]/))
|
||||
inline_status = substr(line, RSTART + 1, RLENGTH - 2)
|
||||
} else if (line ~ /^ ? ? ?(###|##|#)([ \t]|$)/) {
|
||||
finish()
|
||||
} else if (phase && primary == "" && line ~ /^ ? ? ?(-[ \t]+)?\*\*(Status:|Estado:|الحالة:|状态:|狀態:)\*\*[ \t]+(complete|in_progress|pending)([ \t]|$)/) {
|
||||
sub(/^ ? ? ?(-[ \t]+)?\*\*(Status:|Estado:|الحالة:|状态:|狀態:)\*\*[ \t]+/, "", line)
|
||||
sub(/[ \t].*$/, "", line)
|
||||
primary = line
|
||||
}
|
||||
}
|
||||
END {
|
||||
finish()
|
||||
printf "%d/%d complete, %d in_progress, %d pending", complete, total, in_progress, pending
|
||||
}
|
||||
' < "$1"
|
||||
}
|
||||
|
||||
current_active() {
|
||||
if [ -f "${ACTIVE_FILE}" ] && is_within_root "${ACTIVE_FILE}"; then
|
||||
_current="$(tr '\r' '\n' < "${ACTIVE_FILE}")"
|
||||
# Windows editors and older PowerShell defaults can leave a UTF-8 BOM.
|
||||
# Treat it as an encoding marker, not part of the shared plan slug.
|
||||
_utf8_bom="$(printf '\357\273\277')"
|
||||
case "${_current}" in
|
||||
"${_utf8_bom}"*) _current="${_current#"${_utf8_bom}"}" ;;
|
||||
esac
|
||||
slug_is_valid "${_current}" && printf '%s\n' "${_current}"
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
list_plans() {
|
||||
if [ ! -d "${PLAN_ROOT}" ]; then
|
||||
printf '%s\n' 'No planning directory found.'
|
||||
return 0
|
||||
fi
|
||||
if ! is_within_root "${PLAN_ROOT}"; then
|
||||
printf '%s\n' 'Error: planning directory is outside the project or cannot be verified.' >&2
|
||||
return 1
|
||||
fi
|
||||
_active="$(current_active)"
|
||||
_found=0
|
||||
printf '%s\n' 'Available plans:'
|
||||
for _dir in "${PLAN_ROOT}"/*; do
|
||||
[ -d "${_dir}" ] || continue
|
||||
_id="${_dir##*/}"
|
||||
slug_is_valid "${_id}" || continue
|
||||
is_within_root "${_dir}" || continue
|
||||
_plan_file="${_dir}/task_plan.md"
|
||||
[ -f "${_plan_file}" ] && [ -r "${_plan_file}" ] || continue
|
||||
is_within_root "${_plan_file}" || continue
|
||||
_status="$(phase_status "${_plan_file}")" || continue
|
||||
_marker=''
|
||||
if [ "${_id}" = "${_active}" ]; then _marker=' [active]'; fi
|
||||
printf '%s\n' "- ${_id}${_marker} - ${_status}"
|
||||
_found=1
|
||||
done
|
||||
if [ "${_found}" -eq 0 ]; then
|
||||
printf '%s\n' 'No named plans found.'
|
||||
else
|
||||
printf '%s\n' '[active] marks the shared default pointer. Set PLAN_ID to pin a session.'
|
||||
fi
|
||||
}
|
||||
|
||||
if [ "$#" -gt 1 ]; then
|
||||
printf '%s\n' 'Error: list plans or set PLAN_ID in separate calls.' >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
case "${1:-}" in
|
||||
--list|-l) list_plans; exit $? ;;
|
||||
--help|-h)
|
||||
printf '%s\n' 'Usage: set-active-plan.sh [--list|PLAN_ID]' \
|
||||
'Lists saved named plans in the current project without selecting a plan.'
|
||||
exit 0 ;;
|
||||
esac
|
||||
|
||||
if [ "${1:-}" = '' ]; then
|
||||
if [ -d "${PLAN_ROOT}" ] && ! is_within_root "${PLAN_ROOT}"; then
|
||||
printf '%s\n' 'Error: planning directory is outside the project or cannot be verified.' >&2
|
||||
exit 1
|
||||
fi
|
||||
plan_id="$(current_active)"
|
||||
if [ -n "${plan_id}" ] && [ -d "${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)"
|
||||
else
|
||||
printf '%s\n' 'No active plan set.'
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
|
||||
PLAN_ID="$1"
|
||||
PLAN_DIR="${PLAN_ROOT}/${PLAN_ID}"
|
||||
|
||||
if [ ! -d "${PLAN_DIR}" ]; then
|
||||
echo "Error: plan directory not found: ${PLAN_DIR}" >&2
|
||||
echo "Run: init-session.sh \"${PLAN_ID}\" to create it, or check .planning/ for available plans." >&2
|
||||
if ! slug_is_valid "${PLAN_ID}"; then
|
||||
printf '%s\n' 'Error: invalid plan ID. Use a named directory under .planning.' >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mkdir -p "${PLAN_ROOT}"
|
||||
printf "%s\n" "${PLAN_ID}" > "${ACTIVE_FILE}"
|
||||
|
||||
echo "Active plan set to: ${PLAN_ID}"
|
||||
echo "Path: ${PLAN_DIR}"
|
||||
echo ""
|
||||
echo "To pin this terminal session only:"
|
||||
echo " export PLAN_ID=${PLAN_ID}"
|
||||
PLAN_DIR="${PLAN_ROOT}/${PLAN_ID}"
|
||||
if [ ! -d "${PLAN_DIR}" ]; then
|
||||
printf '%s\n' "Error: plan directory not found: ${PLAN_DIR}" \
|
||||
"Run: init-session.sh \"${PLAN_ID}\" to create it, or use --list to see available plans." >&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
|
||||
fi
|
||||
# A pre-existing pointer must itself be a contained regular file before writing.
|
||||
if { [ -e "${ACTIVE_FILE}" ] || [ -L "${ACTIVE_FILE}" ]; } &&
|
||||
{ [ -L "${ACTIVE_FILE}" ] || [ ! -f "${ACTIVE_FILE}" ] || ! is_within_root "${ACTIVE_FILE}"; }; then
|
||||
printf '%s\n' 'Error: active plan pointer is not a safe file inside the project.' >&2
|
||||
exit 1
|
||||
fi
|
||||
# Replace the pointer atomically instead of truncating a possible hardlink.
|
||||
# mktemp creates a private, exclusive file beside the destination.
|
||||
temp_file="$(mktemp "${PLAN_ROOT}/.active_plan.XXXXXX")" || {
|
||||
printf '%s\n' 'Error: could not create the active plan pointer.' >&2
|
||||
exit 1
|
||||
}
|
||||
trap 'rm -f "${temp_file}"' EXIT
|
||||
trap 'exit 1' HUP INT TERM
|
||||
printf '%s\n' "${PLAN_ID}" > "${temp_file}"
|
||||
if ! mv -f "${temp_file}" "${ACTIVE_FILE}"; then
|
||||
printf '%s\n' 'Error: could not replace the active plan pointer.' >&2
|
||||
exit 1
|
||||
fi
|
||||
trap - EXIT HUP INT TERM
|
||||
printf '%s\n' "Active plan set to: ${PLAN_ID}" "Path: ${PLAN_DIR}" '' \
|
||||
'To pin this terminal session only:' " export PLAN_ID=${PLAN_ID}"
|
||||
|
||||
@@ -181,32 +181,36 @@ Helper scripts for automation:
|
||||
|
||||
- `scripts/init-session.sh` — Initialize planning files. With a name arg, creates an isolated plan under `.planning/YYYY-MM-DD-<slug>/` for parallel task workflows. Without args, writes `task_plan.md` at project root (legacy mode, backward-compatible).
|
||||
- `scripts/set-active-plan.sh` — Switch the active plan pointer (`.planning/.active_plan`). Run with a plan ID to switch; run without args to show which plan is current.
|
||||
- `scripts/resolve-plan-dir.sh` — Resolve the active plan directory. A set `$PLAN_ID` is a binding: it resolves or resolution stops, never another plan (issue #237). With no `$PLAN_ID`, checks `.planning/.active_plan`, then newest plan dir by mtime, then falls back to project root (legacy). Used internally by hooks.
|
||||
- `scripts/resolve-plan-dir.sh` — Resolve the active plan directory. A set `$PLAN_ID` is a binding: it resolves or resolution stops, never another plan (issue #237). With no `$PLAN_ID`, multiple named plans refuse selection. A single named plan may use `.planning/.active_plan` or discovery by mtime; otherwise resolution falls back to the project root (legacy). Used internally by hooks.
|
||||
- `scripts/check-complete.sh` — Verify all phases in the active plan are complete.
|
||||
- `scripts/session-catchup.py`: Explicit same-project session-record aggregation or bounded replay (`--metadata` / `--replay`); bare invocation does not access host history. OpenCode uses its read-only SQLite store.
|
||||
- `scripts/attest-plan.sh` (and `.ps1`) — Lock the current `task_plan.md` content with a SHA-256 attestation (v2.37.0). Hooks then refuse to inject plan content if the file diverges from the attested hash. Use `--show` to print the stored hash, `--clear` to remove the attestation.
|
||||
|
||||
### List saved plans
|
||||
|
||||
To find a task before resuming it, run `sh "<skill-dir>/scripts/set-active-plan.sh" --list` or, in Windows PowerShell, `& "<skill-dir>/scripts/set-active-plan.ps1" -List`. Replace `<skill-dir>` with this installed skill directory and keep your current directory at the project root.
|
||||
|
||||
This read-only command lists named plans and phase progress under the current directory's `.planning/`. `[active]` marks the shared default pointer; it does not bind a session. Concurrent tasks still require each host's `PLAN_ID` or separate worktrees.
|
||||
|
||||
### Parallel task workflow
|
||||
|
||||
When working on multiple tasks in the same repo simultaneously:
|
||||
For concurrent tasks, initialize a named plan and pin each host before starting it. Set `SKILL_DIR` to the installed skill directory in each terminal and keep your current directory at the project root:
|
||||
|
||||
```bash
|
||||
# Start task A
|
||||
.init-session.sh "Backend Refactor"
|
||||
# → .planning/2026-01-10-backend-refactor/task_plan.md
|
||||
# Terminal A: use the exact PLAN_ID printed by initialization.
|
||||
sh "$SKILL_DIR/scripts/init-session.sh" "Backend Refactor"
|
||||
export PLAN_ID=2026-09-13-backend-refactor
|
||||
# Start the first agent from this terminal after setting PLAN_ID.
|
||||
|
||||
# Start task B in a second terminal
|
||||
.init-session.sh "Incident Investigation"
|
||||
# → .planning/2026-01-10-incident-investigation/task_plan.md
|
||||
|
||||
# Switch active plan
|
||||
.set-active-plan.sh 2026-01-10-backend-refactor
|
||||
|
||||
# Or pin a terminal to a specific plan
|
||||
export PLAN_ID=2026-01-10-backend-refactor
|
||||
# Terminal B: use the different PLAN_ID printed for this task.
|
||||
sh "$SKILL_DIR/scripts/init-session.sh" "Incident Investigation"
|
||||
export PLAN_ID=2026-09-13-incident-investigation
|
||||
# Start the second agent from this terminal after setting PLAN_ID.
|
||||
```
|
||||
|
||||
Each session reads from its own isolated plan directory. Hooks resolve the correct plan automatically.
|
||||
The IDs are examples; use the IDs printed by your initialization commands. In PowerShell, set `$env:PLAN_ID` before starting the host. Setting it inside an already-running agent's tool subprocess does not change the parent host's environment. Use separate worktrees if the host cannot be pinned per task.
|
||||
|
||||
Use `set-active-plan` for sequential switching of the shared default pointer. Concurrent sessions need their own `PLAN_ID` even when the listing shows `[active]`.
|
||||
|
||||
## Advanced Topics
|
||||
|
||||
|
||||
@@ -404,6 +404,7 @@ function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
$resolvedDir = @(& $resolver | Where-Object { $_ }) | Select-Object -First 1
|
||||
if (-not $resolvedDir -and ((& $resolver -CheckAmbiguity) -eq "PWF_PLAN_AMBIGUOUS_V1")) { return $null }
|
||||
if ($resolvedDir) {
|
||||
$planFile = Join-Path $resolvedDir "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $planFile -ExpectedDirectory $resolvedDir)
|
||||
|
||||
@@ -45,6 +45,10 @@ resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
plan_dir="$(sh "${RESOLVER}" 2>/dev/null)"
|
||||
if [ -z "$plan_dir" ] && [ "$(sh "${RESOLVER}" --check-ambiguity 2>/dev/null)" = "PWF_PLAN_AMBIGUOUS_V1" ]; then
|
||||
printf "[plan-attest] Multiple plans are available. Set PLAN_ID=<slug>; nothing was attested.\n" >&2
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
if [ -n "${plan_dir}" ] && [ -f "${plan_dir}/task_plan.md" ]; then
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
|
||||
@@ -35,6 +35,7 @@ if ($PlanFile -ne "") {
|
||||
try {
|
||||
$resolvedDir = (& $resolver 2>$null | Select-Object -First 1)
|
||||
if ($null -eq $resolvedDir) { $resolvedDir = "" }
|
||||
if (-not $resolvedDir -and ((& $resolver -CheckAmbiguity) -eq "PWF_PLAN_AMBIGUOUS_V1")) { exit 0 }
|
||||
} catch {
|
||||
$resolvedDir = ""
|
||||
}
|
||||
|
||||
@@ -56,6 +56,9 @@ else
|
||||
RESOLVED_DIR=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
RESOLVED_DIR="$(sh "${RESOLVER}" 2>/dev/null)"
|
||||
if [ -z "$RESOLVED_DIR" ] && [ "$(sh "${RESOLVER}" --check-ambiguity 2>/dev/null)" = "PWF_PLAN_AMBIGUOUS_V1" ]; then
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
if [ -n "${RESOLVED_DIR}" ] && [ -f "${RESOLVED_DIR}/task_plan.md" ]; then
|
||||
PLAN_FILE="${RESOLVED_DIR}/task_plan.md"
|
||||
|
||||
@@ -13,7 +13,8 @@
|
||||
# junction/symlink escape; slug validation alone blocks textual traversal.
|
||||
|
||||
param(
|
||||
[string]$PlanRoot = (Join-Path (Get-Location) ".planning")
|
||||
[string]$PlanRoot = (Join-Path (Get-Location) ".planning"),
|
||||
[switch]$CheckAmbiguity
|
||||
)
|
||||
|
||||
$projectRoot = (Get-Location).Path
|
||||
@@ -137,6 +138,30 @@ $activeFile = Join-Path $PlanRoot ".active_plan"
|
||||
# at rc=0. Emptiness is the fail-closed signal on this channel, matching
|
||||
# resolve-plan-dir.sh and the PWF_PLAN_ROOT pin. An empty $env:PLAN_ID is
|
||||
# falsy here and still means "unset".
|
||||
# The optional probe distinguishes ambiguity from a legacy-root fallback.
|
||||
# Multiple named plans require PLAN_ID even without a sessions directory.
|
||||
$planCount = 0
|
||||
if (-not $env:PLAN_ID) {
|
||||
if ((Test-Path -LiteralPath (Join-Path $PlanRoot "sessions") -PathType Container) -and
|
||||
(Test-Path -LiteralPath (Join-Path $projectRoot "task_plan.md") -PathType Leaf)) {
|
||||
$planCount = 1
|
||||
}
|
||||
if (Test-Path -LiteralPath $PlanRoot -PathType Container) {
|
||||
foreach ($entry in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue)) {
|
||||
if ((Test-ValidSlug $entry.Name) -and
|
||||
(Test-Path -LiteralPath (Join-Path $entry.FullName "task_plan.md") -PathType Leaf)) {
|
||||
$planCount++
|
||||
if ($planCount -gt 1) { break }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($CheckAmbiguity) {
|
||||
if ($planCount -gt 1) { Write-Output "PWF_PLAN_AMBIGUOUS_V1" }
|
||||
exit 0
|
||||
}
|
||||
if ($planCount -gt 1) { exit 0 }
|
||||
|
||||
if ($env:PLAN_ID) {
|
||||
if (Test-ValidSlug $env:PLAN_ID) {
|
||||
$candidate = Join-Path $PlanRoot $env:PLAN_ID
|
||||
|
||||
@@ -15,6 +15,13 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Optional probe distinguishes ambiguity from the empty legacy-root result.
|
||||
# Both modes keep stdout data-only and always exit zero.
|
||||
CHECK_AMBIGUITY=0
|
||||
if [ "${1:-}" = "--check-ambiguity" ]; then
|
||||
CHECK_AMBIGUITY=1
|
||||
shift
|
||||
fi
|
||||
PLAN_ROOT="${1:-${PWD}/.planning}"
|
||||
|
||||
# --- PWF_PLAN_ROOT: absolute plan-root binding (issue #212). ---
|
||||
@@ -321,6 +328,29 @@ resolve_latest_dir() {
|
||||
# the fail-closed signal on this channel, exactly as the PWF_PLAN_ROOT guard
|
||||
# above already does it; a non-zero status would kill callers running under
|
||||
# set -e for a condition that is not an internal error.
|
||||
# A shared pointer or mtime is not a per-session binding (issue #240).
|
||||
# Count conservatively, just like injection: slug-valid live plan files.
|
||||
# The legacy root joins the count only when session isolation is armed.
|
||||
PLAN_AMBIGUOUS=0
|
||||
if [ -z "${PLAN_ID:-}" ]; then
|
||||
PLAN_COUNT=0
|
||||
if [ -d "${PLAN_ROOT}/sessions" ] && [ -f "${PWF_ROOT_PIN:-.}/task_plan.md" ]; 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}"
|
||||
slug_is_valid "${plan_candidate_dir##*/}" || continue
|
||||
PLAN_COUNT=$((PLAN_COUNT + 1))
|
||||
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
|
||||
done
|
||||
fi
|
||||
if [ "$CHECK_AMBIGUITY" = "1" ]; then
|
||||
[ "$PLAN_AMBIGUOUS" = "1" ] && printf '%s\n' 'PWF_PLAN_AMBIGUOUS_V1'
|
||||
exit 0
|
||||
fi
|
||||
[ "$PLAN_AMBIGUOUS" = "1" ] && exit 0
|
||||
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
resolve_from_env && exit 0
|
||||
exit 0
|
||||
|
||||
Regular → Executable
+266
-16
@@ -1,27 +1,245 @@
|
||||
# planning-with-files: set or display the active plan pointer (PowerShell).
|
||||
# planning-with-files: set, display, or list the active plan pointer (PowerShell).
|
||||
#
|
||||
# Usage:
|
||||
# .\set-active-plan.ps1 <plan_id> - pin .planning\.active_plan to plan_id
|
||||
# .\set-active-plan.ps1 - print the current active plan (if any)
|
||||
# .\set-active-plan.ps1 -List - list available named plans and phase counts
|
||||
# .\set-active-plan.ps1 --list - equivalent to -List and -l
|
||||
|
||||
param(
|
||||
[string]$PlanId = ""
|
||||
[Parameter(Position = 0)]
|
||||
[string]$PlanId = "",
|
||||
[Alias('l', '-list')]
|
||||
[switch]$List,
|
||||
[Alias('h', '-help')]
|
||||
[switch]$Help
|
||||
)
|
||||
|
||||
$PlanRoot = Join-Path (Get-Location) ".planning"
|
||||
$ProjectRoot = (Get-Location).Path
|
||||
# Windows PowerShell 5.1 can silently change directories when -File inherits
|
||||
# a cwd containing wildcard characters. Recover that physical cwd only for a
|
||||
# direct invocation of this script; interactive Set-Location remains primary.
|
||||
if ($PSVersionTable.PSVersion.Major -eq 5 -and
|
||||
[System.Management.Automation.WildcardPattern]::ContainsWildcardCharacters([Environment]::CurrentDirectory)) {
|
||||
$processArgs = [Environment]::GetCommandLineArgs()
|
||||
for ($index = 0; $index -lt ($processArgs.Length - 1); $index++) {
|
||||
if ($processArgs[$index] -ieq '-File') {
|
||||
$entryScript = $processArgs[$index + 1]
|
||||
if (-not [IO.Path]::IsPathRooted($entryScript)) {
|
||||
$entryScript = Join-Path ([Environment]::CurrentDirectory) $entryScript
|
||||
}
|
||||
if ([IO.Path]::GetFullPath($entryScript) -eq [IO.Path]::GetFullPath($PSCommandPath)) {
|
||||
$ProjectRoot = [Environment]::CurrentDirectory
|
||||
}
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
$PlanRoot = Join-Path $ProjectRoot ".planning"
|
||||
$ActiveFile = Join-Path $PlanRoot ".active_plan"
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
|
||||
# Resolve-Path can retain a junction's spelling. Like resolve-plan-dir.ps1,
|
||||
# open the actual filesystem object before checking the project boundary.
|
||||
# The Windows handle supports both directories and task_plan.md files.
|
||||
function Get-FinalPath {
|
||||
param([string]$Path)
|
||||
if (-not ("PwfPlanListingNative" -as [type])) {
|
||||
Add-Type -ErrorAction Stop -TypeDefinition @'
|
||||
using System;
|
||||
using System.ComponentModel;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
using Microsoft.Win32.SafeHandles;
|
||||
|
||||
public static class PwfPlanListingNative {
|
||||
[DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
|
||||
private static extern SafeFileHandle CreateFileW(
|
||||
string name, uint access, uint share, IntPtr security,
|
||||
uint creation, uint flags, IntPtr template);
|
||||
[DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
|
||||
private static extern uint GetFinalPathNameByHandleW(
|
||||
SafeFileHandle handle, StringBuilder path, uint length, uint flags);
|
||||
[DllImport("libc", SetLastError = true)]
|
||||
private static extern IntPtr realpath(string path, IntPtr resolved);
|
||||
[DllImport("libc")]
|
||||
private static extern void free(IntPtr pointer);
|
||||
|
||||
public static string FinalPath(string path) {
|
||||
if (Environment.OSVersion.Platform != PlatformID.Win32NT) {
|
||||
IntPtr resolved = realpath(path, IntPtr.Zero);
|
||||
if (resolved == IntPtr.Zero) throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
try { return Marshal.PtrToStringAnsi(resolved); }
|
||||
finally { free(resolved); }
|
||||
}
|
||||
// OPEN_EXISTING, FILE_SHARE_READ | WRITE | DELETE, BACKUP_SEMANTICS.
|
||||
using (SafeFileHandle handle = CreateFileW(
|
||||
path, 0, 7, IntPtr.Zero, 3, 0x02000000, IntPtr.Zero)) {
|
||||
if (handle.IsInvalid) throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
StringBuilder buffer = new StringBuilder(32768);
|
||||
uint length = GetFinalPathNameByHandleW(handle, buffer, (uint)buffer.Capacity, 0);
|
||||
if (length == 0 || length >= buffer.Capacity)
|
||||
throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
string result = buffer.ToString();
|
||||
if (result.StartsWith(@"\\?\UNC\", StringComparison.OrdinalIgnoreCase))
|
||||
return @"\\" + result.Substring(8);
|
||||
if (result.StartsWith(@"\\?\", StringComparison.OrdinalIgnoreCase))
|
||||
return result.Substring(4);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
'@
|
||||
}
|
||||
return [PwfPlanListingNative]::FinalPath($Path)
|
||||
}
|
||||
|
||||
function Test-WithinRoot {
|
||||
param([string]$Path)
|
||||
try {
|
||||
$rootReal = (Get-FinalPath $ProjectRoot).TrimEnd('\', '/')
|
||||
$pathReal = (Get-FinalPath $Path).TrimEnd('\', '/')
|
||||
$comparison = [StringComparison]::Ordinal
|
||||
if ($script:IsWindowsHost) { $comparison = [StringComparison]::OrdinalIgnoreCase }
|
||||
return $pathReal.Equals($rootReal, $comparison) -or
|
||||
$pathReal.StartsWith($rootReal + [IO.Path]::DirectorySeparatorChar, $comparison)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
}
|
||||
|
||||
function Test-ValidSlug {
|
||||
param([string]$Name)
|
||||
return $Name -cmatch '^[A-Za-z0-9_][A-Za-z0-9._-]*\z'
|
||||
}
|
||||
|
||||
function Test-SafeActiveFile {
|
||||
param([switch]$AllowLink)
|
||||
$item = Get-Item -LiteralPath $ActiveFile -Force -ErrorAction SilentlyContinue
|
||||
if (-not $item) { return $false }
|
||||
# Reading may follow a verified in-project link; writing must not.
|
||||
return -not $item.PSIsContainer -and
|
||||
($AllowLink -or (($item.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) -and
|
||||
(Test-WithinRoot $ActiveFile)
|
||||
}
|
||||
|
||||
function Get-CurrentActivePlan {
|
||||
if (-not (Test-SafeActiveFile -AllowLink)) { return "" }
|
||||
try {
|
||||
$current = ([string](Get-Content -LiteralPath $ActiveFile -Raw -Encoding UTF8 -ErrorAction Stop)).Trim([char[]]"`r`n")
|
||||
if (Test-ValidSlug $current) { return $current }
|
||||
} catch { }
|
||||
return ""
|
||||
}
|
||||
|
||||
function Add-PhaseStatus {
|
||||
param([hashtable]$Counts, $Phase)
|
||||
if ($null -eq $Phase) { return }
|
||||
$status = $Phase.Inline
|
||||
if ($Phase.Primary) { $status = $Phase.Primary }
|
||||
if ($status) { $Counts[$status]++ }
|
||||
}
|
||||
|
||||
function Get-PhaseStatus {
|
||||
param([string]$PlanFile)
|
||||
$counts = @{ total = 0; complete = 0; in_progress = 0; pending = 0 }
|
||||
$phase = $null
|
||||
$fence = ""
|
||||
$fenceLength = 0
|
||||
# The shipped translations keep status identifiers in English. Unicode
|
||||
# escapes preserve Windows PowerShell 5.1 compatibility without a BOM.
|
||||
$phaseLabel = '(?:Phase|Fase|\u0627\u0644\u0645\u0631\u062d\u0644\u0629|\u9636\u6bb5|\u968e\u6bb5)'
|
||||
$statusLabel = '(?:Status:|Estado:|\u0627\u0644\u062d\u0627\u0644\u0629:|\u72b6\u6001\uff1a|\u72c0\u614b\uff1a)'
|
||||
# Read once; an empty file is a valid plan with zero phases.
|
||||
$content = [string](Get-Content -LiteralPath $PlanFile -Raw -Encoding UTF8 -ErrorAction Stop)
|
||||
foreach ($line in ($content -split '\r?\n')) {
|
||||
if ($fence) {
|
||||
$closing = '^ {0,3}' + [regex]::Escape($fence) + '{' + $fenceLength + ',}[ \t]*$'
|
||||
if ($line -match $closing) { $fence = "" }
|
||||
continue
|
||||
}
|
||||
if ($line -match '^ {0,3}(`{3,}|~{3,})') {
|
||||
$fence = $Matches[1].Substring(0, 1)
|
||||
$fenceLength = $Matches[1].Length
|
||||
continue
|
||||
}
|
||||
if ($line -cmatch ('^ {0,3}###[ \t]+' + $phaseLabel + '[ \t]+[0-9]+(?:[^0-9A-Za-z_]|$)')) {
|
||||
Add-PhaseStatus $counts $phase
|
||||
$phase = @{ Primary = ""; Inline = "" }
|
||||
$counts.total++
|
||||
if ($line -cmatch '\[(complete|in_progress|pending)\]') {
|
||||
$phase.Inline = $Matches[1]
|
||||
}
|
||||
continue
|
||||
}
|
||||
if ($line -match '^ {0,3}#{1,3}(?:[ \t]+|$)') {
|
||||
Add-PhaseStatus $counts $phase
|
||||
$phase = $null
|
||||
continue
|
||||
}
|
||||
if ($null -ne $phase -and -not $phase.Primary -and
|
||||
$line -cmatch ('^ {0,3}(?:-[ \t]+)?\*\*' + $statusLabel + '\*\*[ \t]+(complete|in_progress|pending)(?:[ \t]|$)')) {
|
||||
$phase.Primary = $Matches[1]
|
||||
}
|
||||
}
|
||||
Add-PhaseStatus $counts $phase
|
||||
return "$($counts.complete)/$($counts.total) complete, $($counts.in_progress) in_progress, $($counts.pending) pending"
|
||||
}
|
||||
|
||||
function Show-PlanList {
|
||||
if (-not (Test-Path -LiteralPath $PlanRoot -PathType Container)) {
|
||||
Write-Output "No planning directory found."
|
||||
return
|
||||
}
|
||||
if (-not (Test-WithinRoot $PlanRoot)) {
|
||||
Write-Error "Error: planning directory is outside the project or cannot be verified."
|
||||
exit 1
|
||||
}
|
||||
$active = Get-CurrentActivePlan
|
||||
Write-Output "Available plans:"
|
||||
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)) {
|
||||
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 }
|
||||
try { $status = Get-PhaseStatus $planFile } catch { continue }
|
||||
$marker = ""
|
||||
if ($plan.Name -ceq $active) { $marker = " [active]" }
|
||||
Write-Output "- $($plan.Name)$marker - $status"
|
||||
$found = $true
|
||||
}
|
||||
if (-not $found) { Write-Output "No named plans found." }
|
||||
}
|
||||
|
||||
if ($Help -or $PlanId -eq "--help" -or $PlanId -eq "-h") {
|
||||
Write-Output "Usage: set-active-plan.ps1 [-List|-l|--list|PLAN_ID]"
|
||||
exit 0
|
||||
}
|
||||
|
||||
if ($List -or $PlanId -eq "--list" -or $PlanId -eq "-l") {
|
||||
if ($List -and $PlanId) {
|
||||
Write-Error "Error: list plans or set PLAN_ID in separate calls."
|
||||
exit 1
|
||||
}
|
||||
Show-PlanList
|
||||
exit 0
|
||||
}
|
||||
|
||||
if ($PlanId -eq "") {
|
||||
if (Test-Path $ActiveFile) {
|
||||
$current = (Get-Content $ActiveFile -Raw -Encoding UTF8).Trim()
|
||||
$current = ""
|
||||
if ((Test-Path -LiteralPath $PlanRoot -PathType Container) -and -not (Test-WithinRoot $PlanRoot)) {
|
||||
Write-Error "Error: planning directory is outside the project or cannot be verified."
|
||||
exit 1
|
||||
}
|
||||
if (Test-WithinRoot $PlanRoot) { $current = Get-CurrentActivePlan }
|
||||
if ($current) {
|
||||
$planDir = Join-Path $PlanRoot $current
|
||||
if ($current -ne "" -and (Test-Path $planDir)) {
|
||||
if ((Test-Path -LiteralPath $planDir -PathType Container) -and (Test-WithinRoot $planDir)) {
|
||||
Write-Output "Active plan: $current"
|
||||
Write-Output "Path: $planDir"
|
||||
} elseif ($current -ne "") {
|
||||
Write-Output "Active plan pointer: $current (directory not found - stale pointer)"
|
||||
} else {
|
||||
Write-Output "No active plan set."
|
||||
Write-Output "Active plan pointer: $current (directory not found or outside project - stale pointer)"
|
||||
}
|
||||
} else {
|
||||
Write-Output "No active plan set."
|
||||
@@ -29,21 +247,53 @@ if ($PlanId -eq "") {
|
||||
exit 0
|
||||
}
|
||||
|
||||
if (-not (Test-ValidSlug $PlanId)) {
|
||||
Write-Error "Error: invalid plan ID. Use letters, numbers, underscores, dots, or hyphens; start with a letter, number, or underscore."
|
||||
exit 1
|
||||
}
|
||||
$PlanDir = Join-Path $PlanRoot $PlanId
|
||||
|
||||
if (-not (Test-Path $PlanDir)) {
|
||||
if (-not (Test-Path -LiteralPath $PlanDir -PathType Container)) {
|
||||
Write-Error "Error: plan directory not found: $PlanDir"
|
||||
Write-Error "Run: init-session.sh `"$PlanId`" to create it, or check .planning\ for available plans."
|
||||
exit 1
|
||||
}
|
||||
|
||||
if (-not (Test-Path $PlanRoot)) {
|
||||
New-Item -ItemType Directory -Path $PlanRoot -Force | Out-Null
|
||||
if (-not (Test-WithinRoot $PlanRoot) -or -not (Test-WithinRoot $PlanDir)) {
|
||||
Write-Error "Error: plan directory must remain within the project."
|
||||
exit 1
|
||||
}
|
||||
$activeItem = Get-Item -LiteralPath $ActiveFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not (Test-SafeActiveFile)) {
|
||||
Write-Error "Error: the active plan pointer must be a regular file within the project."
|
||||
exit 1
|
||||
}
|
||||
|
||||
$utf8NoBom = New-Object System.Text.UTF8Encoding($false)
|
||||
[System.IO.File]::WriteAllText($ActiveFile, $PlanId, $utf8NoBom)
|
||||
|
||||
# Replace the directory entry instead of truncating an existing inode: a
|
||||
# hardlinked pointer must not overwrite another file. The exclusive temporary
|
||||
# file lives beside the pointer, keeping replacement on the same filesystem.
|
||||
$tempFile = Join-Path $PlanRoot ('.active_plan.' + [guid]::NewGuid().ToString('N') + '.tmp')
|
||||
$createdTemp = $false
|
||||
try {
|
||||
$stream = [IO.File]::Open($tempFile, [IO.FileMode]::CreateNew, [IO.FileAccess]::Write, [IO.FileShare]::None)
|
||||
$createdTemp = $true
|
||||
try {
|
||||
$bytes = $utf8NoBom.GetBytes($PlanId)
|
||||
$stream.Write($bytes, 0, $bytes.Length)
|
||||
$stream.Flush()
|
||||
} finally { $stream.Dispose() }
|
||||
if ($activeItem) {
|
||||
[IO.File]::Replace($tempFile, $ActiveFile, [NullString]::Value)
|
||||
} else {
|
||||
[IO.File]::Move($tempFile, $ActiveFile)
|
||||
}
|
||||
} catch {
|
||||
Write-Error "Error: could not set the active plan pointer: $($_.Exception.Message)"
|
||||
exit 1
|
||||
} finally {
|
||||
if ($createdTemp -and (Test-Path -LiteralPath $tempFile)) {
|
||||
Remove-Item -LiteralPath $tempFile -Force -ErrorAction SilentlyContinue
|
||||
}
|
||||
}
|
||||
Write-Output "Active plan set to: $PlanId"
|
||||
Write-Output "Path: $PlanDir"
|
||||
Write-Output ""
|
||||
|
||||
Regular → Executable
+323
-38
@@ -1,50 +1,335 @@
|
||||
#!/bin/sh
|
||||
# planning-with-files: set or display the active plan pointer.
|
||||
#
|
||||
# Usage:
|
||||
# set-active-plan.sh <plan_id> — pin .planning/.active_plan to plan_id
|
||||
# set-active-plan.sh — print the current active plan (if any)
|
||||
#
|
||||
# The active plan is stored in .planning/.active_plan and is read by
|
||||
# resolve-plan-dir.sh when no $PLAN_ID env var is set.
|
||||
|
||||
set -e
|
||||
|
||||
# List saved named plans, show the shared pointer, or change that pointer.
|
||||
# Usage: set-active-plan.sh [--list|-l|PLAN_ID]
|
||||
# Operates on the current project; listing never binds a host or injects data.
|
||||
set -eu
|
||||
PLAN_ROOT="${PWD}/.planning"
|
||||
ACTIVE_FILE="${PLAN_ROOT}/.active_plan"
|
||||
PWF_ROOT_PIN=""
|
||||
|
||||
# No args → show current active plan
|
||||
if [ "${1:-}" = "" ]; then
|
||||
if [ -f "${ACTIVE_FILE}" ]; then
|
||||
plan_id="$(tr -d '\r\n' < "${ACTIVE_FILE}")"
|
||||
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ]; then
|
||||
echo "Active plan: ${plan_id}"
|
||||
echo "Path: ${PLAN_ROOT}/${plan_id}"
|
||||
elif [ -n "${plan_id}" ]; then
|
||||
echo "Active plan pointer: ${plan_id} (directory not found — stale pointer)"
|
||||
else
|
||||
echo "No active plan set."
|
||||
fi
|
||||
# Use the resolver canonicalization policy without running plan selection.
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Pure-sh backslash-to-forward-slash normalizer; result lands in $NORM_OUT.
|
||||
# Windows-native coreutils builds (e.g. C:\Program Files\coreutils on PATH
|
||||
# ahead of Git's usr/bin) canonicalize MSYS-style /c/... input to C:\-style
|
||||
# backslash output. The containment prefix match below is written with forward
|
||||
# slashes, so without this normalization every canonical pair mismatches and
|
||||
# resolution silently fails. On POSIX systems paths contain no backslash and
|
||||
# this is the identity. A literal backslash in a Unix filename normalizes to
|
||||
# "/" and at worst fails containment — the safe direction. No subshell, no
|
||||
# fork: plain parameter expansion in a loop.
|
||||
norm_slashes() {
|
||||
NORM_OUT=""
|
||||
_ns_rest="$1"
|
||||
while :; do
|
||||
case "${_ns_rest}" in
|
||||
*\\*)
|
||||
NORM_OUT="${NORM_OUT}${_ns_rest%%\\*}/"
|
||||
_ns_rest="${_ns_rest#*\\}"
|
||||
;;
|
||||
*)
|
||||
NORM_OUT="${NORM_OUT}${_ns_rest}"
|
||||
break
|
||||
;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
out="$(realpath "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v readlink >/dev/null 2>&1; then
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -I -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment guard (security A1.3): a resolved plan dir must canonicalize to a
|
||||
# path under the project root (the CWD the script runs from). A symlink inside
|
||||
# a valid slug dir pointing at /etc or outside the workspace would otherwise let
|
||||
# the hooks hash and inject an arbitrary file. On any violation we return 1 so
|
||||
# the caller treats the candidate as unresolved and falls back safely.
|
||||
#
|
||||
# The root canonicalizes via the relative token "." rather than the $PWD
|
||||
# string. On some Windows/MSYS setups (8.3 short names, the /tmp mount alias)
|
||||
# realpath("$PWD") and realpath(relative-candidate) resolve through different
|
||||
# code paths and land on differently-spelled-but-equal targets, so the prefix
|
||||
# match below fails and resolution silently goes dark. "." resolves through
|
||||
# the same physical-cwd path candidates already use (same fix inject-plan.sh
|
||||
# received earlier; the resolver kept the $PWD form until now). Both sides are
|
||||
# backslash-normalized before comparison for Windows-native canonicalizers.
|
||||
# The root is computed once per run: the newest-mtime scan calls this guard
|
||||
# per plan dir, and each canonicalize costs a process spawn on Windows.
|
||||
#
|
||||
# With a PWF_PLAN_ROOT pin (issue #212) containment is checked against THAT
|
||||
# root instead of the cwd: candidates arrive ${PWF_PLAN_ROOT}/-prefixed, so
|
||||
# both sides canonicalize through the same path spelling. Unpinned keeps the
|
||||
# relative "." root — byte-identical to the legacy check.
|
||||
ROOT_REAL=""
|
||||
ROOT_REAL_SET=0
|
||||
is_within_root() {
|
||||
candidate="$1"
|
||||
if [ "${ROOT_REAL_SET}" = "0" ]; then
|
||||
ROOT_REAL="$(canonicalize "${PWF_ROOT_PIN:-.}")" || ROOT_REAL=""
|
||||
norm_slashes "${ROOT_REAL}"
|
||||
ROOT_REAL="${NORM_OUT}"
|
||||
ROOT_REAL_SET=1
|
||||
fi
|
||||
# Canonicalize the candidate through its cwd-RELATIVE form whenever it
|
||||
# lives under ${PWD}. The candidate string is built from ${PWD} (an MSYS
|
||||
# long-form spelling), while the root canonicalizes from "." (the process
|
||||
# cwd, which a caller may have set with an 8.3 short-form string). A
|
||||
# Windows-native realpath does not unify those spellings, so canonicalizing
|
||||
# both sides from the same cwd base is the only spelling-stable comparison.
|
||||
# The emitted result keeps the original absolute candidate — only the
|
||||
# containment check uses the relative form.
|
||||
# Pinned resolution skips the rewrite: candidate and root then share the
|
||||
# ${PWF_PLAN_ROOT} spelling, so both canonicalize directly from it.
|
||||
if [ -n "${PWF_ROOT_PIN}" ]; then
|
||||
check_target="${candidate}"
|
||||
else
|
||||
echo "No active plan set."
|
||||
case "${candidate}" in
|
||||
"${PWD}"/*) check_target=".${candidate#"${PWD}"}" ;;
|
||||
*) check_target="${candidate}" ;;
|
||||
esac
|
||||
fi
|
||||
cand_real="$(canonicalize "${check_target}")" || cand_real=""
|
||||
norm_slashes "${cand_real}"
|
||||
cand_real="${NORM_OUT}"
|
||||
if [ -z "${ROOT_REAL}" ] || [ -z "${cand_real}" ]; then
|
||||
# Slug validation blocks textual traversal, but only successful
|
||||
# canonicalization can rule out a symlink/junction escape.
|
||||
return 1
|
||||
fi
|
||||
case "${cand_real}" in
|
||||
"${ROOT_REAL}"|"${ROOT_REAL}"/*) return 0 ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Each phase contributes at most one status. An explicit Status line wins
|
||||
# over an inline heading marker. Fenced examples and unrelated sections are
|
||||
# not phases. Keep this parser aligned with the PowerShell helper.
|
||||
phase_status() {
|
||||
awk '
|
||||
function finish() {
|
||||
if (phase) {
|
||||
status = primary != "" ? primary : inline_status
|
||||
if (status == "complete") complete++
|
||||
else if (status == "in_progress") in_progress++
|
||||
else if (status == "pending") pending++
|
||||
}
|
||||
phase = 0; primary = ""; inline_status = ""
|
||||
}
|
||||
{
|
||||
line = $0
|
||||
sub(/\r$/, "", line)
|
||||
trimmed = line
|
||||
sub(/^ */, "", trimmed)
|
||||
if (line ~ /^ ? ? ?```/ || line ~ /^ ? ? ?~~~/) {
|
||||
marker = substr(trimmed, 1, 1)
|
||||
run = 0
|
||||
while (substr(trimmed, run + 1, 1) == marker) run++
|
||||
if (fence == "") { fence = marker; fence_length = run }
|
||||
else if (marker == fence && run >= fence_length && substr(trimmed, run + 1) ~ /^[ \t]*$/) fence = ""
|
||||
next
|
||||
}
|
||||
if (fence != "") next
|
||||
if (line ~ /^ ? ? ?###[ \t]+(Phase|Fase|المرحلة|阶段|階段)[ \t]+[0-9]+([^0-9A-Za-z_]|$)/) {
|
||||
finish(); phase = 1; total++
|
||||
if (match(line, /\[(complete|in_progress|pending)\]/))
|
||||
inline_status = substr(line, RSTART + 1, RLENGTH - 2)
|
||||
} else if (line ~ /^ ? ? ?(###|##|#)([ \t]|$)/) {
|
||||
finish()
|
||||
} else if (phase && primary == "" && line ~ /^ ? ? ?(-[ \t]+)?\*\*(Status:|Estado:|الحالة:|状态:|狀態:)\*\*[ \t]+(complete|in_progress|pending)([ \t]|$)/) {
|
||||
sub(/^ ? ? ?(-[ \t]+)?\*\*(Status:|Estado:|الحالة:|状态:|狀態:)\*\*[ \t]+/, "", line)
|
||||
sub(/[ \t].*$/, "", line)
|
||||
primary = line
|
||||
}
|
||||
}
|
||||
END {
|
||||
finish()
|
||||
printf "%d/%d complete, %d in_progress, %d pending", complete, total, in_progress, pending
|
||||
}
|
||||
' < "$1"
|
||||
}
|
||||
|
||||
current_active() {
|
||||
if [ -f "${ACTIVE_FILE}" ] && is_within_root "${ACTIVE_FILE}"; then
|
||||
_current="$(tr '\r' '\n' < "${ACTIVE_FILE}")"
|
||||
# Windows editors and older PowerShell defaults can leave a UTF-8 BOM.
|
||||
# Treat it as an encoding marker, not part of the shared plan slug.
|
||||
_utf8_bom="$(printf '\357\273\277')"
|
||||
case "${_current}" in
|
||||
"${_utf8_bom}"*) _current="${_current#"${_utf8_bom}"}" ;;
|
||||
esac
|
||||
slug_is_valid "${_current}" && printf '%s\n' "${_current}"
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
list_plans() {
|
||||
if [ ! -d "${PLAN_ROOT}" ]; then
|
||||
printf '%s\n' 'No planning directory found.'
|
||||
return 0
|
||||
fi
|
||||
if ! is_within_root "${PLAN_ROOT}"; then
|
||||
printf '%s\n' 'Error: planning directory is outside the project or cannot be verified.' >&2
|
||||
return 1
|
||||
fi
|
||||
_active="$(current_active)"
|
||||
_found=0
|
||||
printf '%s\n' 'Available plans:'
|
||||
for _dir in "${PLAN_ROOT}"/*; do
|
||||
[ -d "${_dir}" ] || continue
|
||||
_id="${_dir##*/}"
|
||||
slug_is_valid "${_id}" || continue
|
||||
is_within_root "${_dir}" || continue
|
||||
_plan_file="${_dir}/task_plan.md"
|
||||
[ -f "${_plan_file}" ] && [ -r "${_plan_file}" ] || continue
|
||||
is_within_root "${_plan_file}" || continue
|
||||
_status="$(phase_status "${_plan_file}")" || continue
|
||||
_marker=''
|
||||
if [ "${_id}" = "${_active}" ]; then _marker=' [active]'; fi
|
||||
printf '%s\n' "- ${_id}${_marker} - ${_status}"
|
||||
_found=1
|
||||
done
|
||||
if [ "${_found}" -eq 0 ]; then
|
||||
printf '%s\n' 'No named plans found.'
|
||||
else
|
||||
printf '%s\n' '[active] marks the shared default pointer. Set PLAN_ID to pin a session.'
|
||||
fi
|
||||
}
|
||||
|
||||
if [ "$#" -gt 1 ]; then
|
||||
printf '%s\n' 'Error: list plans or set PLAN_ID in separate calls.' >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
case "${1:-}" in
|
||||
--list|-l) list_plans; exit $? ;;
|
||||
--help|-h)
|
||||
printf '%s\n' 'Usage: set-active-plan.sh [--list|PLAN_ID]' \
|
||||
'Lists saved named plans in the current project without selecting a plan.'
|
||||
exit 0 ;;
|
||||
esac
|
||||
|
||||
if [ "${1:-}" = '' ]; then
|
||||
if [ -d "${PLAN_ROOT}" ] && ! is_within_root "${PLAN_ROOT}"; then
|
||||
printf '%s\n' 'Error: planning directory is outside the project or cannot be verified.' >&2
|
||||
exit 1
|
||||
fi
|
||||
plan_id="$(current_active)"
|
||||
if [ -n "${plan_id}" ] && [ -d "${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)"
|
||||
else
|
||||
printf '%s\n' 'No active plan set.'
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
|
||||
PLAN_ID="$1"
|
||||
PLAN_DIR="${PLAN_ROOT}/${PLAN_ID}"
|
||||
|
||||
if [ ! -d "${PLAN_DIR}" ]; then
|
||||
echo "Error: plan directory not found: ${PLAN_DIR}" >&2
|
||||
echo "Run: init-session.sh \"${PLAN_ID}\" to create it, or check .planning/ for available plans." >&2
|
||||
if ! slug_is_valid "${PLAN_ID}"; then
|
||||
printf '%s\n' 'Error: invalid plan ID. Use a named directory under .planning.' >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mkdir -p "${PLAN_ROOT}"
|
||||
printf "%s\n" "${PLAN_ID}" > "${ACTIVE_FILE}"
|
||||
|
||||
echo "Active plan set to: ${PLAN_ID}"
|
||||
echo "Path: ${PLAN_DIR}"
|
||||
echo ""
|
||||
echo "To pin this terminal session only:"
|
||||
echo " export PLAN_ID=${PLAN_ID}"
|
||||
PLAN_DIR="${PLAN_ROOT}/${PLAN_ID}"
|
||||
if [ ! -d "${PLAN_DIR}" ]; then
|
||||
printf '%s\n' "Error: plan directory not found: ${PLAN_DIR}" \
|
||||
"Run: init-session.sh \"${PLAN_ID}\" to create it, or use --list to see available plans." >&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
|
||||
fi
|
||||
# A pre-existing pointer must itself be a contained regular file before writing.
|
||||
if { [ -e "${ACTIVE_FILE}" ] || [ -L "${ACTIVE_FILE}" ]; } &&
|
||||
{ [ -L "${ACTIVE_FILE}" ] || [ ! -f "${ACTIVE_FILE}" ] || ! is_within_root "${ACTIVE_FILE}"; }; then
|
||||
printf '%s\n' 'Error: active plan pointer is not a safe file inside the project.' >&2
|
||||
exit 1
|
||||
fi
|
||||
# Replace the pointer atomically instead of truncating a possible hardlink.
|
||||
# mktemp creates a private, exclusive file beside the destination.
|
||||
temp_file="$(mktemp "${PLAN_ROOT}/.active_plan.XXXXXX")" || {
|
||||
printf '%s\n' 'Error: could not create the active plan pointer.' >&2
|
||||
exit 1
|
||||
}
|
||||
trap 'rm -f "${temp_file}"' EXIT
|
||||
trap 'exit 1' HUP INT TERM
|
||||
printf '%s\n' "${PLAN_ID}" > "${temp_file}"
|
||||
if ! mv -f "${temp_file}" "${ACTIVE_FILE}"; then
|
||||
printf '%s\n' 'Error: could not replace the active plan pointer.' >&2
|
||||
exit 1
|
||||
fi
|
||||
trap - EXIT HUP INT TERM
|
||||
printf '%s\n' "Active plan set to: ${PLAN_ID}" "Path: ${PLAN_DIR}" '' \
|
||||
'To pin this terminal session only:' " export PLAN_ID=${PLAN_ID}"
|
||||
|
||||
@@ -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.17.0"
|
||||
version: "3.18.2"
|
||||
|
||||
---
|
||||
|
||||
@@ -46,7 +46,7 @@ Work like Manus: Use persistent markdown files as your "working memory on disk."
|
||||
|
||||
## FIRST: Restore Project State
|
||||
|
||||
**Before continuing**, resolve the plan this task owns. Use the installed `scripts/resolve-plan-dir.sh` (or `.ps1`) with the host's `PLAN_ID` and `PWF_PLAN_ROOT`, then read `task_plan.md`, `progress.md`, and `findings.md` from that selected directory. If an explicit selector is rejected, or session isolation is armed with multiple plans and no `PLAN_ID`, correct the pin and do not fall back to another task. Run `git diff --stat` for code changes not yet recorded there. All planning filenames below mean that selected directory. For parallel tasks, pin each host before it starts or use separate worktrees; a child process export does not change its host. One orchestrator owns a shared plan and summaries, while workers use assigned files or ledgers.
|
||||
**Before continuing**, resolve the plan this task owns. Use the installed `scripts/resolve-plan-dir.sh` (or `.ps1`) with the host's `PLAN_ID` and `PWF_PLAN_ROOT`, then read `task_plan.md`, `progress.md`, and `findings.md` from that selected directory. If an explicit selector is rejected, or multiple named plans exist without `PLAN_ID`, correct the pin and do not fall back to another task. Run `git diff --stat` for code changes not yet recorded there. All planning filenames below mean that selected directory. For parallel tasks, pin each host before it starts or use separate worktrees; a child process export does not change its host. One orchestrator owns a shared plan and summaries, while workers use assigned files or ledgers.
|
||||
|
||||
```bash
|
||||
# Linux/macOS (auto-detects python3 or python)
|
||||
@@ -212,6 +212,12 @@ Helper scripts for automation:
|
||||
- `scripts/check-complete.sh` — Verify all phases complete
|
||||
- `scripts/session-catchup.py`: Explicit same-project session-record aggregation or bounded replay (`--metadata` / `--replay`); bare invocation does not access host history
|
||||
|
||||
### List saved plans
|
||||
|
||||
To find a task before resuming it, run `sh "<skill-dir>/scripts/set-active-plan.sh" --list` or, in Windows PowerShell, `& "<skill-dir>/scripts/set-active-plan.ps1" -List`. Replace `<skill-dir>` with this installed skill directory and keep your current directory at the project root.
|
||||
|
||||
This read-only command lists named plans and phase progress under the current directory's `.planning/`. `[active]` marks the shared default pointer; it does not bind a session. Concurrent tasks still require each host's `PLAN_ID` or separate worktrees.
|
||||
|
||||
## Advanced Topics
|
||||
|
||||
- **Manus Principles:** See [reference.md](reference.md)
|
||||
|
||||
@@ -404,6 +404,7 @@ function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
$resolvedDir = @(& $resolver | Where-Object { $_ }) | Select-Object -First 1
|
||||
if (-not $resolvedDir -and ((& $resolver -CheckAmbiguity) -eq "PWF_PLAN_AMBIGUOUS_V1")) { return $null }
|
||||
if ($resolvedDir) {
|
||||
$planFile = Join-Path $resolvedDir "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $planFile -ExpectedDirectory $resolvedDir)
|
||||
|
||||
@@ -45,6 +45,10 @@ resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
plan_dir="$(sh "${RESOLVER}" 2>/dev/null)"
|
||||
if [ -z "$plan_dir" ] && [ "$(sh "${RESOLVER}" --check-ambiguity 2>/dev/null)" = "PWF_PLAN_AMBIGUOUS_V1" ]; then
|
||||
printf "[plan-attest] Multiple plans are available. Set PLAN_ID=<slug>; nothing was attested.\n" >&2
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
if [ -n "${plan_dir}" ] && [ -f "${plan_dir}/task_plan.md" ]; then
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
|
||||
@@ -35,6 +35,7 @@ if ($PlanFile -ne "") {
|
||||
try {
|
||||
$resolvedDir = (& $resolver 2>$null | Select-Object -First 1)
|
||||
if ($null -eq $resolvedDir) { $resolvedDir = "" }
|
||||
if (-not $resolvedDir -and ((& $resolver -CheckAmbiguity) -eq "PWF_PLAN_AMBIGUOUS_V1")) { exit 0 }
|
||||
} catch {
|
||||
$resolvedDir = ""
|
||||
}
|
||||
|
||||
@@ -56,6 +56,9 @@ else
|
||||
RESOLVED_DIR=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
RESOLVED_DIR="$(sh "${RESOLVER}" 2>/dev/null)"
|
||||
if [ -z "$RESOLVED_DIR" ] && [ "$(sh "${RESOLVER}" --check-ambiguity 2>/dev/null)" = "PWF_PLAN_AMBIGUOUS_V1" ]; then
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
if [ -n "${RESOLVED_DIR}" ] && [ -f "${RESOLVED_DIR}/task_plan.md" ]; then
|
||||
PLAN_FILE="${RESOLVED_DIR}/task_plan.md"
|
||||
|
||||
@@ -59,12 +59,9 @@ Windows runs the shell chain through Git Bash and nothing else:
|
||||
one turn-marker slot and one progress-guard slot per plan.
|
||||
|
||||
Known, accepted differences from the shell reference:
|
||||
* Two plan directories with the same whole-second mtime, no .active_plan
|
||||
and no PLAN_ID: the reference picks the first in the shell's glob order
|
||||
(locale collation), this twin the first in code-point order. The same
|
||||
collation difference can change which three of four or more nested
|
||||
projects the ambiguity notice names. A machine runs one implementation,
|
||||
so neither choice flips within a session.
|
||||
* Shell glob order follows locale collation; this twin uses code-point
|
||||
order. This can change which three of four or more nested projects the
|
||||
ambiguity notice names.
|
||||
* BSD sed (macOS) appends a newline to a progress.md whose last line has
|
||||
none; GNU sed and this twin do not.
|
||||
* With PWF_PLAN_ROOT set under Git Bash the shell sees the pin as typed
|
||||
@@ -837,6 +834,16 @@ class Injector(object):
|
||||
scope = ""
|
||||
explicit = bool(plan_prefix)
|
||||
plan_id = env.get("PLAN_ID", "")
|
||||
ambiguous = plan_is_ambiguous(
|
||||
plan_prefix + ".planning", plan_root_pin if plan_root_pin else ".", plan_id
|
||||
)
|
||||
if ambiguous and (context == "preflight" or not is_dir(plan_prefix + ".planning/sessions")):
|
||||
if context == "userprompt":
|
||||
self.echo(
|
||||
"[planning-with-files] Multiple plans are available. Set PLAN_ID=<slug> "
|
||||
"for this session; nothing injected."
|
||||
)
|
||||
raise Bail()
|
||||
if plan_id:
|
||||
if slug_is_valid(plan_id) and is_dir(plan_prefix + ".planning/" + plan_id):
|
||||
resolved = plan_prefix + ".planning/" + plan_id
|
||||
@@ -923,30 +930,14 @@ class Injector(object):
|
||||
"single-session mode."
|
||||
)
|
||||
raise Bail()
|
||||
if not plan_id:
|
||||
plan_n = 1 if is_file(plan_prefix + "task_plan.md") else 0
|
||||
try:
|
||||
names = sorted(os.listdir(plan_prefix + ".planning"))
|
||||
except OSError:
|
||||
names = []
|
||||
for name in names:
|
||||
if name.startswith("."):
|
||||
continue
|
||||
if not is_file(plan_prefix + ".planning/" + name + "/task_plan.md"):
|
||||
continue
|
||||
if not slug_is_valid(name):
|
||||
continue
|
||||
plan_n += 1
|
||||
if plan_n > 1:
|
||||
break
|
||||
if plan_n > 1:
|
||||
if context == "userprompt":
|
||||
self.echo(
|
||||
"[planning-with-files] Multiple plans are available while session "
|
||||
"isolation is armed. Set PLAN_ID=<slug> for this session; nothing "
|
||||
"injected."
|
||||
)
|
||||
raise Bail()
|
||||
if ambiguous:
|
||||
if context == "userprompt":
|
||||
self.echo(
|
||||
"[planning-with-files] Multiple plans are available while session "
|
||||
"isolation is armed. Set PLAN_ID=<slug> for this session; nothing "
|
||||
"injected."
|
||||
)
|
||||
raise Bail()
|
||||
|
||||
if not explicit:
|
||||
nested = []
|
||||
@@ -1326,6 +1317,23 @@ def inject(context, env=None):
|
||||
# Twin of resolve-plan-dir.sh (the shared resolver the dispatcher uses).
|
||||
# --------------------------------------------------------------------------
|
||||
|
||||
def plan_is_ambiguous(plan_root, project_root, plan_id=""):
|
||||
"""A project pointer or mtime cannot bind a session to multiple plans."""
|
||||
if plan_id:
|
||||
return False
|
||||
count = 1 if is_dir(plan_root + "/sessions") and is_file(project_root + "/task_plan.md") else 0
|
||||
try:
|
||||
names = os.listdir(plan_root)
|
||||
except OSError:
|
||||
names = []
|
||||
for name in names:
|
||||
if slug_is_valid(name) and is_file(plan_root + "/" + name + "/task_plan.md"):
|
||||
count += 1
|
||||
if count > 1:
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
def resolve_plan_dir(env=None):
|
||||
"""Return (spelled, filesystem) paths of the plan directory, or ("", "").
|
||||
|
||||
@@ -1360,6 +1368,9 @@ def resolve_plan_dir(env=None):
|
||||
return found(plan_id)
|
||||
return ("", "")
|
||||
|
||||
if plan_is_ambiguous(fs_root, pin if pin else "."):
|
||||
return ("", "")
|
||||
|
||||
active_file = fs_root + "/.active_plan"
|
||||
if is_file(active_file):
|
||||
try:
|
||||
@@ -1441,6 +1452,8 @@ class ClaudeDispatcher(object):
|
||||
return (spelled, fs)
|
||||
if self.env.get("PLAN_ID", "") or self.env.get("PWF_PLAN_ROOT", ""):
|
||||
return ("", "")
|
||||
if plan_is_ambiguous(".planning", "."):
|
||||
return ("", "")
|
||||
if is_file("task_plan.md"):
|
||||
return (".", ".")
|
||||
return ("", "")
|
||||
|
||||
@@ -254,6 +254,29 @@ is_within_root() {
|
||||
# The .active_plan pointer, the newest-by-mtime fallback, and the legacy root
|
||||
# task_plan.md are cwd GUESSES — only guesses are subject to the nested-root
|
||||
# conflict check below.
|
||||
# Shared .active_plan and directory mtime cannot identify this session's plan.
|
||||
# Check before selection or preflight, even when isolation was never armed.
|
||||
PLAN_AMBIGUOUS=0
|
||||
if [ -z "${PLAN_ID:-}" ]; then
|
||||
PLAN_COUNT=0
|
||||
if [ -d "${PLAN_PREFIX}.planning/sessions" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; 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}"
|
||||
slug_is_valid "${plan_candidate_dir##*/}" || continue
|
||||
PLAN_COUNT=$((PLAN_COUNT + 1))
|
||||
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
|
||||
done
|
||||
fi
|
||||
if [ "$PLAN_AMBIGUOUS" = "1" ] && { [ "$CONTEXT" = "preflight" ] || [ ! -d "${PLAN_PREFIX}.planning/sessions" ]; }; then
|
||||
if [ "$CONTEXT" = "userprompt" ]; then
|
||||
echo "[planning-with-files] Multiple plans are available. Set PLAN_ID=<slug> for this session; nothing injected."
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
|
||||
RESOLVED=""
|
||||
SCOPE=""
|
||||
EXPLICIT=0
|
||||
@@ -442,27 +465,13 @@ PY
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# An attachment admits a session but does not select one of several plans.
|
||||
# When isolation is armed, require PLAN_ID if more than one live same-root
|
||||
# candidate exists. PWF_PLAN_ROOT selects the project root, not a plan
|
||||
# within that root.
|
||||
if [ -z "${PLAN_ID:-}" ]; then
|
||||
SESSION_PLAN_N=0
|
||||
[ -f "${PLAN_PREFIX}task_plan.md" ] && SESSION_PLAN_N=1
|
||||
for candidate in "${PLAN_PREFIX}".planning/*/task_plan.md; do
|
||||
[ -f "$candidate" ] || continue
|
||||
candidate_dir="${candidate%/task_plan.md}"
|
||||
candidate_slug="${candidate_dir##*/}"
|
||||
slug_is_valid "$candidate_slug" || continue
|
||||
SESSION_PLAN_N=$((SESSION_PLAN_N + 1))
|
||||
[ "$SESSION_PLAN_N" -gt 1 ] && break
|
||||
done
|
||||
if [ "$SESSION_PLAN_N" -gt 1 ]; then
|
||||
if [ "$CONTEXT" = "userprompt" ]; then
|
||||
echo "[planning-with-files] Multiple plans are available while session isolation is armed. Set PLAN_ID=<slug> for this session; nothing injected."
|
||||
fi
|
||||
exit 0
|
||||
# Attachment admits a session but does not select its plan. Preserve the
|
||||
# attachment-first notice above for sessions that never opted in.
|
||||
if [ "$PLAN_AMBIGUOUS" = "1" ]; then
|
||||
if [ "$CONTEXT" = "userprompt" ]; then
|
||||
echo "[planning-with-files] Multiple plans are available while session isolation is armed. Set PLAN_ID=<slug> for this session; nothing injected."
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@@ -13,7 +13,8 @@
|
||||
# junction/symlink escape; slug validation alone blocks textual traversal.
|
||||
|
||||
param(
|
||||
[string]$PlanRoot = (Join-Path (Get-Location) ".planning")
|
||||
[string]$PlanRoot = (Join-Path (Get-Location) ".planning"),
|
||||
[switch]$CheckAmbiguity
|
||||
)
|
||||
|
||||
$projectRoot = (Get-Location).Path
|
||||
@@ -137,6 +138,30 @@ $activeFile = Join-Path $PlanRoot ".active_plan"
|
||||
# at rc=0. Emptiness is the fail-closed signal on this channel, matching
|
||||
# resolve-plan-dir.sh and the PWF_PLAN_ROOT pin. An empty $env:PLAN_ID is
|
||||
# falsy here and still means "unset".
|
||||
# The optional probe distinguishes ambiguity from a legacy-root fallback.
|
||||
# Multiple named plans require PLAN_ID even without a sessions directory.
|
||||
$planCount = 0
|
||||
if (-not $env:PLAN_ID) {
|
||||
if ((Test-Path -LiteralPath (Join-Path $PlanRoot "sessions") -PathType Container) -and
|
||||
(Test-Path -LiteralPath (Join-Path $projectRoot "task_plan.md") -PathType Leaf)) {
|
||||
$planCount = 1
|
||||
}
|
||||
if (Test-Path -LiteralPath $PlanRoot -PathType Container) {
|
||||
foreach ($entry in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue)) {
|
||||
if ((Test-ValidSlug $entry.Name) -and
|
||||
(Test-Path -LiteralPath (Join-Path $entry.FullName "task_plan.md") -PathType Leaf)) {
|
||||
$planCount++
|
||||
if ($planCount -gt 1) { break }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($CheckAmbiguity) {
|
||||
if ($planCount -gt 1) { Write-Output "PWF_PLAN_AMBIGUOUS_V1" }
|
||||
exit 0
|
||||
}
|
||||
if ($planCount -gt 1) { exit 0 }
|
||||
|
||||
if ($env:PLAN_ID) {
|
||||
if (Test-ValidSlug $env:PLAN_ID) {
|
||||
$candidate = Join-Path $PlanRoot $env:PLAN_ID
|
||||
|
||||
@@ -15,6 +15,13 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Optional probe distinguishes ambiguity from the empty legacy-root result.
|
||||
# Both modes keep stdout data-only and always exit zero.
|
||||
CHECK_AMBIGUITY=0
|
||||
if [ "${1:-}" = "--check-ambiguity" ]; then
|
||||
CHECK_AMBIGUITY=1
|
||||
shift
|
||||
fi
|
||||
PLAN_ROOT="${1:-${PWD}/.planning}"
|
||||
|
||||
# --- PWF_PLAN_ROOT: absolute plan-root binding (issue #212). ---
|
||||
@@ -321,6 +328,29 @@ resolve_latest_dir() {
|
||||
# the fail-closed signal on this channel, exactly as the PWF_PLAN_ROOT guard
|
||||
# above already does it; a non-zero status would kill callers running under
|
||||
# set -e for a condition that is not an internal error.
|
||||
# A shared pointer or mtime is not a per-session binding (issue #240).
|
||||
# Count conservatively, just like injection: slug-valid live plan files.
|
||||
# The legacy root joins the count only when session isolation is armed.
|
||||
PLAN_AMBIGUOUS=0
|
||||
if [ -z "${PLAN_ID:-}" ]; then
|
||||
PLAN_COUNT=0
|
||||
if [ -d "${PLAN_ROOT}/sessions" ] && [ -f "${PWF_ROOT_PIN:-.}/task_plan.md" ]; 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}"
|
||||
slug_is_valid "${plan_candidate_dir##*/}" || continue
|
||||
PLAN_COUNT=$((PLAN_COUNT + 1))
|
||||
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
|
||||
done
|
||||
fi
|
||||
if [ "$CHECK_AMBIGUITY" = "1" ]; then
|
||||
[ "$PLAN_AMBIGUOUS" = "1" ] && printf '%s\n' 'PWF_PLAN_AMBIGUOUS_V1'
|
||||
exit 0
|
||||
fi
|
||||
[ "$PLAN_AMBIGUOUS" = "1" ] && exit 0
|
||||
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
resolve_from_env && exit 0
|
||||
exit 0
|
||||
|
||||
Regular → Executable
+266
-16
@@ -1,27 +1,245 @@
|
||||
# planning-with-files: set or display the active plan pointer (PowerShell).
|
||||
# planning-with-files: set, display, or list the active plan pointer (PowerShell).
|
||||
#
|
||||
# Usage:
|
||||
# .\set-active-plan.ps1 <plan_id> - pin .planning\.active_plan to plan_id
|
||||
# .\set-active-plan.ps1 - print the current active plan (if any)
|
||||
# .\set-active-plan.ps1 -List - list available named plans and phase counts
|
||||
# .\set-active-plan.ps1 --list - equivalent to -List and -l
|
||||
|
||||
param(
|
||||
[string]$PlanId = ""
|
||||
[Parameter(Position = 0)]
|
||||
[string]$PlanId = "",
|
||||
[Alias('l', '-list')]
|
||||
[switch]$List,
|
||||
[Alias('h', '-help')]
|
||||
[switch]$Help
|
||||
)
|
||||
|
||||
$PlanRoot = Join-Path (Get-Location) ".planning"
|
||||
$ProjectRoot = (Get-Location).Path
|
||||
# Windows PowerShell 5.1 can silently change directories when -File inherits
|
||||
# a cwd containing wildcard characters. Recover that physical cwd only for a
|
||||
# direct invocation of this script; interactive Set-Location remains primary.
|
||||
if ($PSVersionTable.PSVersion.Major -eq 5 -and
|
||||
[System.Management.Automation.WildcardPattern]::ContainsWildcardCharacters([Environment]::CurrentDirectory)) {
|
||||
$processArgs = [Environment]::GetCommandLineArgs()
|
||||
for ($index = 0; $index -lt ($processArgs.Length - 1); $index++) {
|
||||
if ($processArgs[$index] -ieq '-File') {
|
||||
$entryScript = $processArgs[$index + 1]
|
||||
if (-not [IO.Path]::IsPathRooted($entryScript)) {
|
||||
$entryScript = Join-Path ([Environment]::CurrentDirectory) $entryScript
|
||||
}
|
||||
if ([IO.Path]::GetFullPath($entryScript) -eq [IO.Path]::GetFullPath($PSCommandPath)) {
|
||||
$ProjectRoot = [Environment]::CurrentDirectory
|
||||
}
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
$PlanRoot = Join-Path $ProjectRoot ".planning"
|
||||
$ActiveFile = Join-Path $PlanRoot ".active_plan"
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
|
||||
# Resolve-Path can retain a junction's spelling. Like resolve-plan-dir.ps1,
|
||||
# open the actual filesystem object before checking the project boundary.
|
||||
# The Windows handle supports both directories and task_plan.md files.
|
||||
function Get-FinalPath {
|
||||
param([string]$Path)
|
||||
if (-not ("PwfPlanListingNative" -as [type])) {
|
||||
Add-Type -ErrorAction Stop -TypeDefinition @'
|
||||
using System;
|
||||
using System.ComponentModel;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
using Microsoft.Win32.SafeHandles;
|
||||
|
||||
public static class PwfPlanListingNative {
|
||||
[DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
|
||||
private static extern SafeFileHandle CreateFileW(
|
||||
string name, uint access, uint share, IntPtr security,
|
||||
uint creation, uint flags, IntPtr template);
|
||||
[DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
|
||||
private static extern uint GetFinalPathNameByHandleW(
|
||||
SafeFileHandle handle, StringBuilder path, uint length, uint flags);
|
||||
[DllImport("libc", SetLastError = true)]
|
||||
private static extern IntPtr realpath(string path, IntPtr resolved);
|
||||
[DllImport("libc")]
|
||||
private static extern void free(IntPtr pointer);
|
||||
|
||||
public static string FinalPath(string path) {
|
||||
if (Environment.OSVersion.Platform != PlatformID.Win32NT) {
|
||||
IntPtr resolved = realpath(path, IntPtr.Zero);
|
||||
if (resolved == IntPtr.Zero) throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
try { return Marshal.PtrToStringAnsi(resolved); }
|
||||
finally { free(resolved); }
|
||||
}
|
||||
// OPEN_EXISTING, FILE_SHARE_READ | WRITE | DELETE, BACKUP_SEMANTICS.
|
||||
using (SafeFileHandle handle = CreateFileW(
|
||||
path, 0, 7, IntPtr.Zero, 3, 0x02000000, IntPtr.Zero)) {
|
||||
if (handle.IsInvalid) throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
StringBuilder buffer = new StringBuilder(32768);
|
||||
uint length = GetFinalPathNameByHandleW(handle, buffer, (uint)buffer.Capacity, 0);
|
||||
if (length == 0 || length >= buffer.Capacity)
|
||||
throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
string result = buffer.ToString();
|
||||
if (result.StartsWith(@"\\?\UNC\", StringComparison.OrdinalIgnoreCase))
|
||||
return @"\\" + result.Substring(8);
|
||||
if (result.StartsWith(@"\\?\", StringComparison.OrdinalIgnoreCase))
|
||||
return result.Substring(4);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
'@
|
||||
}
|
||||
return [PwfPlanListingNative]::FinalPath($Path)
|
||||
}
|
||||
|
||||
function Test-WithinRoot {
|
||||
param([string]$Path)
|
||||
try {
|
||||
$rootReal = (Get-FinalPath $ProjectRoot).TrimEnd('\', '/')
|
||||
$pathReal = (Get-FinalPath $Path).TrimEnd('\', '/')
|
||||
$comparison = [StringComparison]::Ordinal
|
||||
if ($script:IsWindowsHost) { $comparison = [StringComparison]::OrdinalIgnoreCase }
|
||||
return $pathReal.Equals($rootReal, $comparison) -or
|
||||
$pathReal.StartsWith($rootReal + [IO.Path]::DirectorySeparatorChar, $comparison)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
}
|
||||
|
||||
function Test-ValidSlug {
|
||||
param([string]$Name)
|
||||
return $Name -cmatch '^[A-Za-z0-9_][A-Za-z0-9._-]*\z'
|
||||
}
|
||||
|
||||
function Test-SafeActiveFile {
|
||||
param([switch]$AllowLink)
|
||||
$item = Get-Item -LiteralPath $ActiveFile -Force -ErrorAction SilentlyContinue
|
||||
if (-not $item) { return $false }
|
||||
# Reading may follow a verified in-project link; writing must not.
|
||||
return -not $item.PSIsContainer -and
|
||||
($AllowLink -or (($item.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) -and
|
||||
(Test-WithinRoot $ActiveFile)
|
||||
}
|
||||
|
||||
function Get-CurrentActivePlan {
|
||||
if (-not (Test-SafeActiveFile -AllowLink)) { return "" }
|
||||
try {
|
||||
$current = ([string](Get-Content -LiteralPath $ActiveFile -Raw -Encoding UTF8 -ErrorAction Stop)).Trim([char[]]"`r`n")
|
||||
if (Test-ValidSlug $current) { return $current }
|
||||
} catch { }
|
||||
return ""
|
||||
}
|
||||
|
||||
function Add-PhaseStatus {
|
||||
param([hashtable]$Counts, $Phase)
|
||||
if ($null -eq $Phase) { return }
|
||||
$status = $Phase.Inline
|
||||
if ($Phase.Primary) { $status = $Phase.Primary }
|
||||
if ($status) { $Counts[$status]++ }
|
||||
}
|
||||
|
||||
function Get-PhaseStatus {
|
||||
param([string]$PlanFile)
|
||||
$counts = @{ total = 0; complete = 0; in_progress = 0; pending = 0 }
|
||||
$phase = $null
|
||||
$fence = ""
|
||||
$fenceLength = 0
|
||||
# The shipped translations keep status identifiers in English. Unicode
|
||||
# escapes preserve Windows PowerShell 5.1 compatibility without a BOM.
|
||||
$phaseLabel = '(?:Phase|Fase|\u0627\u0644\u0645\u0631\u062d\u0644\u0629|\u9636\u6bb5|\u968e\u6bb5)'
|
||||
$statusLabel = '(?:Status:|Estado:|\u0627\u0644\u062d\u0627\u0644\u0629:|\u72b6\u6001\uff1a|\u72c0\u614b\uff1a)'
|
||||
# Read once; an empty file is a valid plan with zero phases.
|
||||
$content = [string](Get-Content -LiteralPath $PlanFile -Raw -Encoding UTF8 -ErrorAction Stop)
|
||||
foreach ($line in ($content -split '\r?\n')) {
|
||||
if ($fence) {
|
||||
$closing = '^ {0,3}' + [regex]::Escape($fence) + '{' + $fenceLength + ',}[ \t]*$'
|
||||
if ($line -match $closing) { $fence = "" }
|
||||
continue
|
||||
}
|
||||
if ($line -match '^ {0,3}(`{3,}|~{3,})') {
|
||||
$fence = $Matches[1].Substring(0, 1)
|
||||
$fenceLength = $Matches[1].Length
|
||||
continue
|
||||
}
|
||||
if ($line -cmatch ('^ {0,3}###[ \t]+' + $phaseLabel + '[ \t]+[0-9]+(?:[^0-9A-Za-z_]|$)')) {
|
||||
Add-PhaseStatus $counts $phase
|
||||
$phase = @{ Primary = ""; Inline = "" }
|
||||
$counts.total++
|
||||
if ($line -cmatch '\[(complete|in_progress|pending)\]') {
|
||||
$phase.Inline = $Matches[1]
|
||||
}
|
||||
continue
|
||||
}
|
||||
if ($line -match '^ {0,3}#{1,3}(?:[ \t]+|$)') {
|
||||
Add-PhaseStatus $counts $phase
|
||||
$phase = $null
|
||||
continue
|
||||
}
|
||||
if ($null -ne $phase -and -not $phase.Primary -and
|
||||
$line -cmatch ('^ {0,3}(?:-[ \t]+)?\*\*' + $statusLabel + '\*\*[ \t]+(complete|in_progress|pending)(?:[ \t]|$)')) {
|
||||
$phase.Primary = $Matches[1]
|
||||
}
|
||||
}
|
||||
Add-PhaseStatus $counts $phase
|
||||
return "$($counts.complete)/$($counts.total) complete, $($counts.in_progress) in_progress, $($counts.pending) pending"
|
||||
}
|
||||
|
||||
function Show-PlanList {
|
||||
if (-not (Test-Path -LiteralPath $PlanRoot -PathType Container)) {
|
||||
Write-Output "No planning directory found."
|
||||
return
|
||||
}
|
||||
if (-not (Test-WithinRoot $PlanRoot)) {
|
||||
Write-Error "Error: planning directory is outside the project or cannot be verified."
|
||||
exit 1
|
||||
}
|
||||
$active = Get-CurrentActivePlan
|
||||
Write-Output "Available plans:"
|
||||
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)) {
|
||||
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 }
|
||||
try { $status = Get-PhaseStatus $planFile } catch { continue }
|
||||
$marker = ""
|
||||
if ($plan.Name -ceq $active) { $marker = " [active]" }
|
||||
Write-Output "- $($plan.Name)$marker - $status"
|
||||
$found = $true
|
||||
}
|
||||
if (-not $found) { Write-Output "No named plans found." }
|
||||
}
|
||||
|
||||
if ($Help -or $PlanId -eq "--help" -or $PlanId -eq "-h") {
|
||||
Write-Output "Usage: set-active-plan.ps1 [-List|-l|--list|PLAN_ID]"
|
||||
exit 0
|
||||
}
|
||||
|
||||
if ($List -or $PlanId -eq "--list" -or $PlanId -eq "-l") {
|
||||
if ($List -and $PlanId) {
|
||||
Write-Error "Error: list plans or set PLAN_ID in separate calls."
|
||||
exit 1
|
||||
}
|
||||
Show-PlanList
|
||||
exit 0
|
||||
}
|
||||
|
||||
if ($PlanId -eq "") {
|
||||
if (Test-Path $ActiveFile) {
|
||||
$current = (Get-Content $ActiveFile -Raw -Encoding UTF8).Trim()
|
||||
$current = ""
|
||||
if ((Test-Path -LiteralPath $PlanRoot -PathType Container) -and -not (Test-WithinRoot $PlanRoot)) {
|
||||
Write-Error "Error: planning directory is outside the project or cannot be verified."
|
||||
exit 1
|
||||
}
|
||||
if (Test-WithinRoot $PlanRoot) { $current = Get-CurrentActivePlan }
|
||||
if ($current) {
|
||||
$planDir = Join-Path $PlanRoot $current
|
||||
if ($current -ne "" -and (Test-Path $planDir)) {
|
||||
if ((Test-Path -LiteralPath $planDir -PathType Container) -and (Test-WithinRoot $planDir)) {
|
||||
Write-Output "Active plan: $current"
|
||||
Write-Output "Path: $planDir"
|
||||
} elseif ($current -ne "") {
|
||||
Write-Output "Active plan pointer: $current (directory not found - stale pointer)"
|
||||
} else {
|
||||
Write-Output "No active plan set."
|
||||
Write-Output "Active plan pointer: $current (directory not found or outside project - stale pointer)"
|
||||
}
|
||||
} else {
|
||||
Write-Output "No active plan set."
|
||||
@@ -29,21 +247,53 @@ if ($PlanId -eq "") {
|
||||
exit 0
|
||||
}
|
||||
|
||||
if (-not (Test-ValidSlug $PlanId)) {
|
||||
Write-Error "Error: invalid plan ID. Use letters, numbers, underscores, dots, or hyphens; start with a letter, number, or underscore."
|
||||
exit 1
|
||||
}
|
||||
$PlanDir = Join-Path $PlanRoot $PlanId
|
||||
|
||||
if (-not (Test-Path $PlanDir)) {
|
||||
if (-not (Test-Path -LiteralPath $PlanDir -PathType Container)) {
|
||||
Write-Error "Error: plan directory not found: $PlanDir"
|
||||
Write-Error "Run: init-session.sh `"$PlanId`" to create it, or check .planning\ for available plans."
|
||||
exit 1
|
||||
}
|
||||
|
||||
if (-not (Test-Path $PlanRoot)) {
|
||||
New-Item -ItemType Directory -Path $PlanRoot -Force | Out-Null
|
||||
if (-not (Test-WithinRoot $PlanRoot) -or -not (Test-WithinRoot $PlanDir)) {
|
||||
Write-Error "Error: plan directory must remain within the project."
|
||||
exit 1
|
||||
}
|
||||
$activeItem = Get-Item -LiteralPath $ActiveFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not (Test-SafeActiveFile)) {
|
||||
Write-Error "Error: the active plan pointer must be a regular file within the project."
|
||||
exit 1
|
||||
}
|
||||
|
||||
$utf8NoBom = New-Object System.Text.UTF8Encoding($false)
|
||||
[System.IO.File]::WriteAllText($ActiveFile, $PlanId, $utf8NoBom)
|
||||
|
||||
# Replace the directory entry instead of truncating an existing inode: a
|
||||
# hardlinked pointer must not overwrite another file. The exclusive temporary
|
||||
# file lives beside the pointer, keeping replacement on the same filesystem.
|
||||
$tempFile = Join-Path $PlanRoot ('.active_plan.' + [guid]::NewGuid().ToString('N') + '.tmp')
|
||||
$createdTemp = $false
|
||||
try {
|
||||
$stream = [IO.File]::Open($tempFile, [IO.FileMode]::CreateNew, [IO.FileAccess]::Write, [IO.FileShare]::None)
|
||||
$createdTemp = $true
|
||||
try {
|
||||
$bytes = $utf8NoBom.GetBytes($PlanId)
|
||||
$stream.Write($bytes, 0, $bytes.Length)
|
||||
$stream.Flush()
|
||||
} finally { $stream.Dispose() }
|
||||
if ($activeItem) {
|
||||
[IO.File]::Replace($tempFile, $ActiveFile, [NullString]::Value)
|
||||
} else {
|
||||
[IO.File]::Move($tempFile, $ActiveFile)
|
||||
}
|
||||
} catch {
|
||||
Write-Error "Error: could not set the active plan pointer: $($_.Exception.Message)"
|
||||
exit 1
|
||||
} finally {
|
||||
if ($createdTemp -and (Test-Path -LiteralPath $tempFile)) {
|
||||
Remove-Item -LiteralPath $tempFile -Force -ErrorAction SilentlyContinue
|
||||
}
|
||||
}
|
||||
Write-Output "Active plan set to: $PlanId"
|
||||
Write-Output "Path: $PlanDir"
|
||||
Write-Output ""
|
||||
|
||||
Regular → Executable
+323
-38
@@ -1,50 +1,335 @@
|
||||
#!/bin/sh
|
||||
# planning-with-files: set or display the active plan pointer.
|
||||
#
|
||||
# Usage:
|
||||
# set-active-plan.sh <plan_id> — pin .planning/.active_plan to plan_id
|
||||
# set-active-plan.sh — print the current active plan (if any)
|
||||
#
|
||||
# The active plan is stored in .planning/.active_plan and is read by
|
||||
# resolve-plan-dir.sh when no $PLAN_ID env var is set.
|
||||
|
||||
set -e
|
||||
|
||||
# List saved named plans, show the shared pointer, or change that pointer.
|
||||
# Usage: set-active-plan.sh [--list|-l|PLAN_ID]
|
||||
# Operates on the current project; listing never binds a host or injects data.
|
||||
set -eu
|
||||
PLAN_ROOT="${PWD}/.planning"
|
||||
ACTIVE_FILE="${PLAN_ROOT}/.active_plan"
|
||||
PWF_ROOT_PIN=""
|
||||
|
||||
# No args → show current active plan
|
||||
if [ "${1:-}" = "" ]; then
|
||||
if [ -f "${ACTIVE_FILE}" ]; then
|
||||
plan_id="$(tr -d '\r\n' < "${ACTIVE_FILE}")"
|
||||
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ]; then
|
||||
echo "Active plan: ${plan_id}"
|
||||
echo "Path: ${PLAN_ROOT}/${plan_id}"
|
||||
elif [ -n "${plan_id}" ]; then
|
||||
echo "Active plan pointer: ${plan_id} (directory not found — stale pointer)"
|
||||
else
|
||||
echo "No active plan set."
|
||||
fi
|
||||
# Use the resolver canonicalization policy without running plan selection.
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Pure-sh backslash-to-forward-slash normalizer; result lands in $NORM_OUT.
|
||||
# Windows-native coreutils builds (e.g. C:\Program Files\coreutils on PATH
|
||||
# ahead of Git's usr/bin) canonicalize MSYS-style /c/... input to C:\-style
|
||||
# backslash output. The containment prefix match below is written with forward
|
||||
# slashes, so without this normalization every canonical pair mismatches and
|
||||
# resolution silently fails. On POSIX systems paths contain no backslash and
|
||||
# this is the identity. A literal backslash in a Unix filename normalizes to
|
||||
# "/" and at worst fails containment — the safe direction. No subshell, no
|
||||
# fork: plain parameter expansion in a loop.
|
||||
norm_slashes() {
|
||||
NORM_OUT=""
|
||||
_ns_rest="$1"
|
||||
while :; do
|
||||
case "${_ns_rest}" in
|
||||
*\\*)
|
||||
NORM_OUT="${NORM_OUT}${_ns_rest%%\\*}/"
|
||||
_ns_rest="${_ns_rest#*\\}"
|
||||
;;
|
||||
*)
|
||||
NORM_OUT="${NORM_OUT}${_ns_rest}"
|
||||
break
|
||||
;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
out="$(realpath "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v readlink >/dev/null 2>&1; then
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -I -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment guard (security A1.3): a resolved plan dir must canonicalize to a
|
||||
# path under the project root (the CWD the script runs from). A symlink inside
|
||||
# a valid slug dir pointing at /etc or outside the workspace would otherwise let
|
||||
# the hooks hash and inject an arbitrary file. On any violation we return 1 so
|
||||
# the caller treats the candidate as unresolved and falls back safely.
|
||||
#
|
||||
# The root canonicalizes via the relative token "." rather than the $PWD
|
||||
# string. On some Windows/MSYS setups (8.3 short names, the /tmp mount alias)
|
||||
# realpath("$PWD") and realpath(relative-candidate) resolve through different
|
||||
# code paths and land on differently-spelled-but-equal targets, so the prefix
|
||||
# match below fails and resolution silently goes dark. "." resolves through
|
||||
# the same physical-cwd path candidates already use (same fix inject-plan.sh
|
||||
# received earlier; the resolver kept the $PWD form until now). Both sides are
|
||||
# backslash-normalized before comparison for Windows-native canonicalizers.
|
||||
# The root is computed once per run: the newest-mtime scan calls this guard
|
||||
# per plan dir, and each canonicalize costs a process spawn on Windows.
|
||||
#
|
||||
# With a PWF_PLAN_ROOT pin (issue #212) containment is checked against THAT
|
||||
# root instead of the cwd: candidates arrive ${PWF_PLAN_ROOT}/-prefixed, so
|
||||
# both sides canonicalize through the same path spelling. Unpinned keeps the
|
||||
# relative "." root — byte-identical to the legacy check.
|
||||
ROOT_REAL=""
|
||||
ROOT_REAL_SET=0
|
||||
is_within_root() {
|
||||
candidate="$1"
|
||||
if [ "${ROOT_REAL_SET}" = "0" ]; then
|
||||
ROOT_REAL="$(canonicalize "${PWF_ROOT_PIN:-.}")" || ROOT_REAL=""
|
||||
norm_slashes "${ROOT_REAL}"
|
||||
ROOT_REAL="${NORM_OUT}"
|
||||
ROOT_REAL_SET=1
|
||||
fi
|
||||
# Canonicalize the candidate through its cwd-RELATIVE form whenever it
|
||||
# lives under ${PWD}. The candidate string is built from ${PWD} (an MSYS
|
||||
# long-form spelling), while the root canonicalizes from "." (the process
|
||||
# cwd, which a caller may have set with an 8.3 short-form string). A
|
||||
# Windows-native realpath does not unify those spellings, so canonicalizing
|
||||
# both sides from the same cwd base is the only spelling-stable comparison.
|
||||
# The emitted result keeps the original absolute candidate — only the
|
||||
# containment check uses the relative form.
|
||||
# Pinned resolution skips the rewrite: candidate and root then share the
|
||||
# ${PWF_PLAN_ROOT} spelling, so both canonicalize directly from it.
|
||||
if [ -n "${PWF_ROOT_PIN}" ]; then
|
||||
check_target="${candidate}"
|
||||
else
|
||||
echo "No active plan set."
|
||||
case "${candidate}" in
|
||||
"${PWD}"/*) check_target=".${candidate#"${PWD}"}" ;;
|
||||
*) check_target="${candidate}" ;;
|
||||
esac
|
||||
fi
|
||||
cand_real="$(canonicalize "${check_target}")" || cand_real=""
|
||||
norm_slashes "${cand_real}"
|
||||
cand_real="${NORM_OUT}"
|
||||
if [ -z "${ROOT_REAL}" ] || [ -z "${cand_real}" ]; then
|
||||
# Slug validation blocks textual traversal, but only successful
|
||||
# canonicalization can rule out a symlink/junction escape.
|
||||
return 1
|
||||
fi
|
||||
case "${cand_real}" in
|
||||
"${ROOT_REAL}"|"${ROOT_REAL}"/*) return 0 ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Each phase contributes at most one status. An explicit Status line wins
|
||||
# over an inline heading marker. Fenced examples and unrelated sections are
|
||||
# not phases. Keep this parser aligned with the PowerShell helper.
|
||||
phase_status() {
|
||||
awk '
|
||||
function finish() {
|
||||
if (phase) {
|
||||
status = primary != "" ? primary : inline_status
|
||||
if (status == "complete") complete++
|
||||
else if (status == "in_progress") in_progress++
|
||||
else if (status == "pending") pending++
|
||||
}
|
||||
phase = 0; primary = ""; inline_status = ""
|
||||
}
|
||||
{
|
||||
line = $0
|
||||
sub(/\r$/, "", line)
|
||||
trimmed = line
|
||||
sub(/^ */, "", trimmed)
|
||||
if (line ~ /^ ? ? ?```/ || line ~ /^ ? ? ?~~~/) {
|
||||
marker = substr(trimmed, 1, 1)
|
||||
run = 0
|
||||
while (substr(trimmed, run + 1, 1) == marker) run++
|
||||
if (fence == "") { fence = marker; fence_length = run }
|
||||
else if (marker == fence && run >= fence_length && substr(trimmed, run + 1) ~ /^[ \t]*$/) fence = ""
|
||||
next
|
||||
}
|
||||
if (fence != "") next
|
||||
if (line ~ /^ ? ? ?###[ \t]+(Phase|Fase|المرحلة|阶段|階段)[ \t]+[0-9]+([^0-9A-Za-z_]|$)/) {
|
||||
finish(); phase = 1; total++
|
||||
if (match(line, /\[(complete|in_progress|pending)\]/))
|
||||
inline_status = substr(line, RSTART + 1, RLENGTH - 2)
|
||||
} else if (line ~ /^ ? ? ?(###|##|#)([ \t]|$)/) {
|
||||
finish()
|
||||
} else if (phase && primary == "" && line ~ /^ ? ? ?(-[ \t]+)?\*\*(Status:|Estado:|الحالة:|状态:|狀態:)\*\*[ \t]+(complete|in_progress|pending)([ \t]|$)/) {
|
||||
sub(/^ ? ? ?(-[ \t]+)?\*\*(Status:|Estado:|الحالة:|状态:|狀態:)\*\*[ \t]+/, "", line)
|
||||
sub(/[ \t].*$/, "", line)
|
||||
primary = line
|
||||
}
|
||||
}
|
||||
END {
|
||||
finish()
|
||||
printf "%d/%d complete, %d in_progress, %d pending", complete, total, in_progress, pending
|
||||
}
|
||||
' < "$1"
|
||||
}
|
||||
|
||||
current_active() {
|
||||
if [ -f "${ACTIVE_FILE}" ] && is_within_root "${ACTIVE_FILE}"; then
|
||||
_current="$(tr '\r' '\n' < "${ACTIVE_FILE}")"
|
||||
# Windows editors and older PowerShell defaults can leave a UTF-8 BOM.
|
||||
# Treat it as an encoding marker, not part of the shared plan slug.
|
||||
_utf8_bom="$(printf '\357\273\277')"
|
||||
case "${_current}" in
|
||||
"${_utf8_bom}"*) _current="${_current#"${_utf8_bom}"}" ;;
|
||||
esac
|
||||
slug_is_valid "${_current}" && printf '%s\n' "${_current}"
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
list_plans() {
|
||||
if [ ! -d "${PLAN_ROOT}" ]; then
|
||||
printf '%s\n' 'No planning directory found.'
|
||||
return 0
|
||||
fi
|
||||
if ! is_within_root "${PLAN_ROOT}"; then
|
||||
printf '%s\n' 'Error: planning directory is outside the project or cannot be verified.' >&2
|
||||
return 1
|
||||
fi
|
||||
_active="$(current_active)"
|
||||
_found=0
|
||||
printf '%s\n' 'Available plans:'
|
||||
for _dir in "${PLAN_ROOT}"/*; do
|
||||
[ -d "${_dir}" ] || continue
|
||||
_id="${_dir##*/}"
|
||||
slug_is_valid "${_id}" || continue
|
||||
is_within_root "${_dir}" || continue
|
||||
_plan_file="${_dir}/task_plan.md"
|
||||
[ -f "${_plan_file}" ] && [ -r "${_plan_file}" ] || continue
|
||||
is_within_root "${_plan_file}" || continue
|
||||
_status="$(phase_status "${_plan_file}")" || continue
|
||||
_marker=''
|
||||
if [ "${_id}" = "${_active}" ]; then _marker=' [active]'; fi
|
||||
printf '%s\n' "- ${_id}${_marker} - ${_status}"
|
||||
_found=1
|
||||
done
|
||||
if [ "${_found}" -eq 0 ]; then
|
||||
printf '%s\n' 'No named plans found.'
|
||||
else
|
||||
printf '%s\n' '[active] marks the shared default pointer. Set PLAN_ID to pin a session.'
|
||||
fi
|
||||
}
|
||||
|
||||
if [ "$#" -gt 1 ]; then
|
||||
printf '%s\n' 'Error: list plans or set PLAN_ID in separate calls.' >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
case "${1:-}" in
|
||||
--list|-l) list_plans; exit $? ;;
|
||||
--help|-h)
|
||||
printf '%s\n' 'Usage: set-active-plan.sh [--list|PLAN_ID]' \
|
||||
'Lists saved named plans in the current project without selecting a plan.'
|
||||
exit 0 ;;
|
||||
esac
|
||||
|
||||
if [ "${1:-}" = '' ]; then
|
||||
if [ -d "${PLAN_ROOT}" ] && ! is_within_root "${PLAN_ROOT}"; then
|
||||
printf '%s\n' 'Error: planning directory is outside the project or cannot be verified.' >&2
|
||||
exit 1
|
||||
fi
|
||||
plan_id="$(current_active)"
|
||||
if [ -n "${plan_id}" ] && [ -d "${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)"
|
||||
else
|
||||
printf '%s\n' 'No active plan set.'
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
|
||||
PLAN_ID="$1"
|
||||
PLAN_DIR="${PLAN_ROOT}/${PLAN_ID}"
|
||||
|
||||
if [ ! -d "${PLAN_DIR}" ]; then
|
||||
echo "Error: plan directory not found: ${PLAN_DIR}" >&2
|
||||
echo "Run: init-session.sh \"${PLAN_ID}\" to create it, or check .planning/ for available plans." >&2
|
||||
if ! slug_is_valid "${PLAN_ID}"; then
|
||||
printf '%s\n' 'Error: invalid plan ID. Use a named directory under .planning.' >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mkdir -p "${PLAN_ROOT}"
|
||||
printf "%s\n" "${PLAN_ID}" > "${ACTIVE_FILE}"
|
||||
|
||||
echo "Active plan set to: ${PLAN_ID}"
|
||||
echo "Path: ${PLAN_DIR}"
|
||||
echo ""
|
||||
echo "To pin this terminal session only:"
|
||||
echo " export PLAN_ID=${PLAN_ID}"
|
||||
PLAN_DIR="${PLAN_ROOT}/${PLAN_ID}"
|
||||
if [ ! -d "${PLAN_DIR}" ]; then
|
||||
printf '%s\n' "Error: plan directory not found: ${PLAN_DIR}" \
|
||||
"Run: init-session.sh \"${PLAN_ID}\" to create it, or use --list to see available plans." >&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
|
||||
fi
|
||||
# A pre-existing pointer must itself be a contained regular file before writing.
|
||||
if { [ -e "${ACTIVE_FILE}" ] || [ -L "${ACTIVE_FILE}" ]; } &&
|
||||
{ [ -L "${ACTIVE_FILE}" ] || [ ! -f "${ACTIVE_FILE}" ] || ! is_within_root "${ACTIVE_FILE}"; }; then
|
||||
printf '%s\n' 'Error: active plan pointer is not a safe file inside the project.' >&2
|
||||
exit 1
|
||||
fi
|
||||
# Replace the pointer atomically instead of truncating a possible hardlink.
|
||||
# mktemp creates a private, exclusive file beside the destination.
|
||||
temp_file="$(mktemp "${PLAN_ROOT}/.active_plan.XXXXXX")" || {
|
||||
printf '%s\n' 'Error: could not create the active plan pointer.' >&2
|
||||
exit 1
|
||||
}
|
||||
trap 'rm -f "${temp_file}"' EXIT
|
||||
trap 'exit 1' HUP INT TERM
|
||||
printf '%s\n' "${PLAN_ID}" > "${temp_file}"
|
||||
if ! mv -f "${temp_file}" "${ACTIVE_FILE}"; then
|
||||
printf '%s\n' 'Error: could not replace the active plan pointer.' >&2
|
||||
exit 1
|
||||
fi
|
||||
trap - EXIT HUP INT TERM
|
||||
printf '%s\n' "Active plan set to: ${PLAN_ID}" "Path: ${PLAN_DIR}" '' \
|
||||
'To pin this terminal session only:' " export PLAN_ID=${PLAN_ID}"
|
||||
|
||||
@@ -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.17.0"
|
||||
version: "3.18.2"
|
||||
---
|
||||
|
||||
# Planning with Files
|
||||
@@ -45,7 +45,7 @@ Work like Manus: Use persistent markdown files as your "working memory on disk."
|
||||
|
||||
## FIRST: Restore Project State
|
||||
|
||||
**Before continuing**, resolve the plan this task owns. Use the installed `scripts/resolve-plan-dir.sh` (or `.ps1`) with the host's `PLAN_ID` and `PWF_PLAN_ROOT`, then read `task_plan.md`, `progress.md`, and `findings.md` from that selected directory. If an explicit selector is rejected, or session isolation is armed with multiple plans and no `PLAN_ID`, correct the pin and do not fall back to another task. Run `git diff --stat` for code changes not yet recorded there. All planning filenames below mean that selected directory. For parallel tasks, pin each host before it starts or use separate worktrees; a child process export does not change its host. One orchestrator owns a shared plan and summaries, while workers use assigned files or ledgers.
|
||||
**Before continuing**, resolve the plan this task owns. Use the installed `scripts/resolve-plan-dir.sh` (or `.ps1`) with the host's `PLAN_ID` and `PWF_PLAN_ROOT`, then read `task_plan.md`, `progress.md`, and `findings.md` from that selected directory. If an explicit selector is rejected, or multiple named plans exist without `PLAN_ID`, correct the pin and do not fall back to another task. Run `git diff --stat` for code changes not yet recorded there. All planning filenames below mean that selected directory. For parallel tasks, pin each host before it starts or use separate worktrees; a child process export does not change its host. One orchestrator owns a shared plan and summaries, while workers use assigned files or ledgers.
|
||||
|
||||
```bash
|
||||
$(command -v python3 || command -v python) .factory/skills/planning-with-files/scripts/session-catchup.py --metadata "$(pwd)"
|
||||
@@ -205,6 +205,12 @@ Helper scripts for automation:
|
||||
- `scripts/check-complete.sh` — Verify all phases complete
|
||||
- `scripts/session-catchup.py`: Explicit same-project session-record aggregation or bounded replay (`--metadata` / `--replay`); bare invocation does not access host history
|
||||
|
||||
### List saved plans
|
||||
|
||||
To find a task before resuming it, run `sh "<skill-dir>/scripts/set-active-plan.sh" --list` or, in Windows PowerShell, `& "<skill-dir>/scripts/set-active-plan.ps1" -List`. Replace `<skill-dir>` with this installed skill directory and keep your current directory at the project root.
|
||||
|
||||
This read-only command lists named plans and phase progress under the current directory's `.planning/`. `[active]` marks the shared default pointer; it does not bind a session. Concurrent tasks still require each host's `PLAN_ID` or separate worktrees.
|
||||
|
||||
## Advanced Topics
|
||||
|
||||
- **Manus Principles:** See [references.md](./references.md)
|
||||
|
||||
@@ -404,6 +404,7 @@ function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
$resolvedDir = @(& $resolver | Where-Object { $_ }) | Select-Object -First 1
|
||||
if (-not $resolvedDir -and ((& $resolver -CheckAmbiguity) -eq "PWF_PLAN_AMBIGUOUS_V1")) { return $null }
|
||||
if ($resolvedDir) {
|
||||
$planFile = Join-Path $resolvedDir "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $planFile -ExpectedDirectory $resolvedDir)
|
||||
|
||||
@@ -45,6 +45,10 @@ resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
plan_dir="$(sh "${RESOLVER}" 2>/dev/null)"
|
||||
if [ -z "$plan_dir" ] && [ "$(sh "${RESOLVER}" --check-ambiguity 2>/dev/null)" = "PWF_PLAN_AMBIGUOUS_V1" ]; then
|
||||
printf "[plan-attest] Multiple plans are available. Set PLAN_ID=<slug>; nothing was attested.\n" >&2
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
if [ -n "${plan_dir}" ] && [ -f "${plan_dir}/task_plan.md" ]; then
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
|
||||
@@ -35,6 +35,7 @@ if ($PlanFile -ne "") {
|
||||
try {
|
||||
$resolvedDir = (& $resolver 2>$null | Select-Object -First 1)
|
||||
if ($null -eq $resolvedDir) { $resolvedDir = "" }
|
||||
if (-not $resolvedDir -and ((& $resolver -CheckAmbiguity) -eq "PWF_PLAN_AMBIGUOUS_V1")) { exit 0 }
|
||||
} catch {
|
||||
$resolvedDir = ""
|
||||
}
|
||||
|
||||
@@ -56,6 +56,9 @@ else
|
||||
RESOLVED_DIR=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
RESOLVED_DIR="$(sh "${RESOLVER}" 2>/dev/null)"
|
||||
if [ -z "$RESOLVED_DIR" ] && [ "$(sh "${RESOLVER}" --check-ambiguity 2>/dev/null)" = "PWF_PLAN_AMBIGUOUS_V1" ]; then
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
if [ -n "${RESOLVED_DIR}" ] && [ -f "${RESOLVED_DIR}/task_plan.md" ]; then
|
||||
PLAN_FILE="${RESOLVED_DIR}/task_plan.md"
|
||||
|
||||
@@ -59,12 +59,9 @@ Windows runs the shell chain through Git Bash and nothing else:
|
||||
one turn-marker slot and one progress-guard slot per plan.
|
||||
|
||||
Known, accepted differences from the shell reference:
|
||||
* Two plan directories with the same whole-second mtime, no .active_plan
|
||||
and no PLAN_ID: the reference picks the first in the shell's glob order
|
||||
(locale collation), this twin the first in code-point order. The same
|
||||
collation difference can change which three of four or more nested
|
||||
projects the ambiguity notice names. A machine runs one implementation,
|
||||
so neither choice flips within a session.
|
||||
* Shell glob order follows locale collation; this twin uses code-point
|
||||
order. This can change which three of four or more nested projects the
|
||||
ambiguity notice names.
|
||||
* BSD sed (macOS) appends a newline to a progress.md whose last line has
|
||||
none; GNU sed and this twin do not.
|
||||
* With PWF_PLAN_ROOT set under Git Bash the shell sees the pin as typed
|
||||
@@ -837,6 +834,16 @@ class Injector(object):
|
||||
scope = ""
|
||||
explicit = bool(plan_prefix)
|
||||
plan_id = env.get("PLAN_ID", "")
|
||||
ambiguous = plan_is_ambiguous(
|
||||
plan_prefix + ".planning", plan_root_pin if plan_root_pin else ".", plan_id
|
||||
)
|
||||
if ambiguous and (context == "preflight" or not is_dir(plan_prefix + ".planning/sessions")):
|
||||
if context == "userprompt":
|
||||
self.echo(
|
||||
"[planning-with-files] Multiple plans are available. Set PLAN_ID=<slug> "
|
||||
"for this session; nothing injected."
|
||||
)
|
||||
raise Bail()
|
||||
if plan_id:
|
||||
if slug_is_valid(plan_id) and is_dir(plan_prefix + ".planning/" + plan_id):
|
||||
resolved = plan_prefix + ".planning/" + plan_id
|
||||
@@ -923,30 +930,14 @@ class Injector(object):
|
||||
"single-session mode."
|
||||
)
|
||||
raise Bail()
|
||||
if not plan_id:
|
||||
plan_n = 1 if is_file(plan_prefix + "task_plan.md") else 0
|
||||
try:
|
||||
names = sorted(os.listdir(plan_prefix + ".planning"))
|
||||
except OSError:
|
||||
names = []
|
||||
for name in names:
|
||||
if name.startswith("."):
|
||||
continue
|
||||
if not is_file(plan_prefix + ".planning/" + name + "/task_plan.md"):
|
||||
continue
|
||||
if not slug_is_valid(name):
|
||||
continue
|
||||
plan_n += 1
|
||||
if plan_n > 1:
|
||||
break
|
||||
if plan_n > 1:
|
||||
if context == "userprompt":
|
||||
self.echo(
|
||||
"[planning-with-files] Multiple plans are available while session "
|
||||
"isolation is armed. Set PLAN_ID=<slug> for this session; nothing "
|
||||
"injected."
|
||||
)
|
||||
raise Bail()
|
||||
if ambiguous:
|
||||
if context == "userprompt":
|
||||
self.echo(
|
||||
"[planning-with-files] Multiple plans are available while session "
|
||||
"isolation is armed. Set PLAN_ID=<slug> for this session; nothing "
|
||||
"injected."
|
||||
)
|
||||
raise Bail()
|
||||
|
||||
if not explicit:
|
||||
nested = []
|
||||
@@ -1326,6 +1317,23 @@ def inject(context, env=None):
|
||||
# Twin of resolve-plan-dir.sh (the shared resolver the dispatcher uses).
|
||||
# --------------------------------------------------------------------------
|
||||
|
||||
def plan_is_ambiguous(plan_root, project_root, plan_id=""):
|
||||
"""A project pointer or mtime cannot bind a session to multiple plans."""
|
||||
if plan_id:
|
||||
return False
|
||||
count = 1 if is_dir(plan_root + "/sessions") and is_file(project_root + "/task_plan.md") else 0
|
||||
try:
|
||||
names = os.listdir(plan_root)
|
||||
except OSError:
|
||||
names = []
|
||||
for name in names:
|
||||
if slug_is_valid(name) and is_file(plan_root + "/" + name + "/task_plan.md"):
|
||||
count += 1
|
||||
if count > 1:
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
def resolve_plan_dir(env=None):
|
||||
"""Return (spelled, filesystem) paths of the plan directory, or ("", "").
|
||||
|
||||
@@ -1360,6 +1368,9 @@ def resolve_plan_dir(env=None):
|
||||
return found(plan_id)
|
||||
return ("", "")
|
||||
|
||||
if plan_is_ambiguous(fs_root, pin if pin else "."):
|
||||
return ("", "")
|
||||
|
||||
active_file = fs_root + "/.active_plan"
|
||||
if is_file(active_file):
|
||||
try:
|
||||
@@ -1441,6 +1452,8 @@ class ClaudeDispatcher(object):
|
||||
return (spelled, fs)
|
||||
if self.env.get("PLAN_ID", "") or self.env.get("PWF_PLAN_ROOT", ""):
|
||||
return ("", "")
|
||||
if plan_is_ambiguous(".planning", "."):
|
||||
return ("", "")
|
||||
if is_file("task_plan.md"):
|
||||
return (".", ".")
|
||||
return ("", "")
|
||||
|
||||
@@ -254,6 +254,29 @@ is_within_root() {
|
||||
# The .active_plan pointer, the newest-by-mtime fallback, and the legacy root
|
||||
# task_plan.md are cwd GUESSES — only guesses are subject to the nested-root
|
||||
# conflict check below.
|
||||
# Shared .active_plan and directory mtime cannot identify this session's plan.
|
||||
# Check before selection or preflight, even when isolation was never armed.
|
||||
PLAN_AMBIGUOUS=0
|
||||
if [ -z "${PLAN_ID:-}" ]; then
|
||||
PLAN_COUNT=0
|
||||
if [ -d "${PLAN_PREFIX}.planning/sessions" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; 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}"
|
||||
slug_is_valid "${plan_candidate_dir##*/}" || continue
|
||||
PLAN_COUNT=$((PLAN_COUNT + 1))
|
||||
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
|
||||
done
|
||||
fi
|
||||
if [ "$PLAN_AMBIGUOUS" = "1" ] && { [ "$CONTEXT" = "preflight" ] || [ ! -d "${PLAN_PREFIX}.planning/sessions" ]; }; then
|
||||
if [ "$CONTEXT" = "userprompt" ]; then
|
||||
echo "[planning-with-files] Multiple plans are available. Set PLAN_ID=<slug> for this session; nothing injected."
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
|
||||
RESOLVED=""
|
||||
SCOPE=""
|
||||
EXPLICIT=0
|
||||
@@ -442,27 +465,13 @@ PY
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# An attachment admits a session but does not select one of several plans.
|
||||
# When isolation is armed, require PLAN_ID if more than one live same-root
|
||||
# candidate exists. PWF_PLAN_ROOT selects the project root, not a plan
|
||||
# within that root.
|
||||
if [ -z "${PLAN_ID:-}" ]; then
|
||||
SESSION_PLAN_N=0
|
||||
[ -f "${PLAN_PREFIX}task_plan.md" ] && SESSION_PLAN_N=1
|
||||
for candidate in "${PLAN_PREFIX}".planning/*/task_plan.md; do
|
||||
[ -f "$candidate" ] || continue
|
||||
candidate_dir="${candidate%/task_plan.md}"
|
||||
candidate_slug="${candidate_dir##*/}"
|
||||
slug_is_valid "$candidate_slug" || continue
|
||||
SESSION_PLAN_N=$((SESSION_PLAN_N + 1))
|
||||
[ "$SESSION_PLAN_N" -gt 1 ] && break
|
||||
done
|
||||
if [ "$SESSION_PLAN_N" -gt 1 ]; then
|
||||
if [ "$CONTEXT" = "userprompt" ]; then
|
||||
echo "[planning-with-files] Multiple plans are available while session isolation is armed. Set PLAN_ID=<slug> for this session; nothing injected."
|
||||
fi
|
||||
exit 0
|
||||
# Attachment admits a session but does not select its plan. Preserve the
|
||||
# attachment-first notice above for sessions that never opted in.
|
||||
if [ "$PLAN_AMBIGUOUS" = "1" ]; then
|
||||
if [ "$CONTEXT" = "userprompt" ]; then
|
||||
echo "[planning-with-files] Multiple plans are available while session isolation is armed. Set PLAN_ID=<slug> for this session; nothing injected."
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@@ -13,7 +13,8 @@
|
||||
# junction/symlink escape; slug validation alone blocks textual traversal.
|
||||
|
||||
param(
|
||||
[string]$PlanRoot = (Join-Path (Get-Location) ".planning")
|
||||
[string]$PlanRoot = (Join-Path (Get-Location) ".planning"),
|
||||
[switch]$CheckAmbiguity
|
||||
)
|
||||
|
||||
$projectRoot = (Get-Location).Path
|
||||
@@ -137,6 +138,30 @@ $activeFile = Join-Path $PlanRoot ".active_plan"
|
||||
# at rc=0. Emptiness is the fail-closed signal on this channel, matching
|
||||
# resolve-plan-dir.sh and the PWF_PLAN_ROOT pin. An empty $env:PLAN_ID is
|
||||
# falsy here and still means "unset".
|
||||
# The optional probe distinguishes ambiguity from a legacy-root fallback.
|
||||
# Multiple named plans require PLAN_ID even without a sessions directory.
|
||||
$planCount = 0
|
||||
if (-not $env:PLAN_ID) {
|
||||
if ((Test-Path -LiteralPath (Join-Path $PlanRoot "sessions") -PathType Container) -and
|
||||
(Test-Path -LiteralPath (Join-Path $projectRoot "task_plan.md") -PathType Leaf)) {
|
||||
$planCount = 1
|
||||
}
|
||||
if (Test-Path -LiteralPath $PlanRoot -PathType Container) {
|
||||
foreach ($entry in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue)) {
|
||||
if ((Test-ValidSlug $entry.Name) -and
|
||||
(Test-Path -LiteralPath (Join-Path $entry.FullName "task_plan.md") -PathType Leaf)) {
|
||||
$planCount++
|
||||
if ($planCount -gt 1) { break }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($CheckAmbiguity) {
|
||||
if ($planCount -gt 1) { Write-Output "PWF_PLAN_AMBIGUOUS_V1" }
|
||||
exit 0
|
||||
}
|
||||
if ($planCount -gt 1) { exit 0 }
|
||||
|
||||
if ($env:PLAN_ID) {
|
||||
if (Test-ValidSlug $env:PLAN_ID) {
|
||||
$candidate = Join-Path $PlanRoot $env:PLAN_ID
|
||||
|
||||
@@ -15,6 +15,13 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Optional probe distinguishes ambiguity from the empty legacy-root result.
|
||||
# Both modes keep stdout data-only and always exit zero.
|
||||
CHECK_AMBIGUITY=0
|
||||
if [ "${1:-}" = "--check-ambiguity" ]; then
|
||||
CHECK_AMBIGUITY=1
|
||||
shift
|
||||
fi
|
||||
PLAN_ROOT="${1:-${PWD}/.planning}"
|
||||
|
||||
# --- PWF_PLAN_ROOT: absolute plan-root binding (issue #212). ---
|
||||
@@ -321,6 +328,29 @@ resolve_latest_dir() {
|
||||
# the fail-closed signal on this channel, exactly as the PWF_PLAN_ROOT guard
|
||||
# above already does it; a non-zero status would kill callers running under
|
||||
# set -e for a condition that is not an internal error.
|
||||
# A shared pointer or mtime is not a per-session binding (issue #240).
|
||||
# Count conservatively, just like injection: slug-valid live plan files.
|
||||
# The legacy root joins the count only when session isolation is armed.
|
||||
PLAN_AMBIGUOUS=0
|
||||
if [ -z "${PLAN_ID:-}" ]; then
|
||||
PLAN_COUNT=0
|
||||
if [ -d "${PLAN_ROOT}/sessions" ] && [ -f "${PWF_ROOT_PIN:-.}/task_plan.md" ]; 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}"
|
||||
slug_is_valid "${plan_candidate_dir##*/}" || continue
|
||||
PLAN_COUNT=$((PLAN_COUNT + 1))
|
||||
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
|
||||
done
|
||||
fi
|
||||
if [ "$CHECK_AMBIGUITY" = "1" ]; then
|
||||
[ "$PLAN_AMBIGUOUS" = "1" ] && printf '%s\n' 'PWF_PLAN_AMBIGUOUS_V1'
|
||||
exit 0
|
||||
fi
|
||||
[ "$PLAN_AMBIGUOUS" = "1" ] && exit 0
|
||||
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
resolve_from_env && exit 0
|
||||
exit 0
|
||||
|
||||
Regular → Executable
+266
-16
@@ -1,27 +1,245 @@
|
||||
# planning-with-files: set or display the active plan pointer (PowerShell).
|
||||
# planning-with-files: set, display, or list the active plan pointer (PowerShell).
|
||||
#
|
||||
# Usage:
|
||||
# .\set-active-plan.ps1 <plan_id> - pin .planning\.active_plan to plan_id
|
||||
# .\set-active-plan.ps1 - print the current active plan (if any)
|
||||
# .\set-active-plan.ps1 -List - list available named plans and phase counts
|
||||
# .\set-active-plan.ps1 --list - equivalent to -List and -l
|
||||
|
||||
param(
|
||||
[string]$PlanId = ""
|
||||
[Parameter(Position = 0)]
|
||||
[string]$PlanId = "",
|
||||
[Alias('l', '-list')]
|
||||
[switch]$List,
|
||||
[Alias('h', '-help')]
|
||||
[switch]$Help
|
||||
)
|
||||
|
||||
$PlanRoot = Join-Path (Get-Location) ".planning"
|
||||
$ProjectRoot = (Get-Location).Path
|
||||
# Windows PowerShell 5.1 can silently change directories when -File inherits
|
||||
# a cwd containing wildcard characters. Recover that physical cwd only for a
|
||||
# direct invocation of this script; interactive Set-Location remains primary.
|
||||
if ($PSVersionTable.PSVersion.Major -eq 5 -and
|
||||
[System.Management.Automation.WildcardPattern]::ContainsWildcardCharacters([Environment]::CurrentDirectory)) {
|
||||
$processArgs = [Environment]::GetCommandLineArgs()
|
||||
for ($index = 0; $index -lt ($processArgs.Length - 1); $index++) {
|
||||
if ($processArgs[$index] -ieq '-File') {
|
||||
$entryScript = $processArgs[$index + 1]
|
||||
if (-not [IO.Path]::IsPathRooted($entryScript)) {
|
||||
$entryScript = Join-Path ([Environment]::CurrentDirectory) $entryScript
|
||||
}
|
||||
if ([IO.Path]::GetFullPath($entryScript) -eq [IO.Path]::GetFullPath($PSCommandPath)) {
|
||||
$ProjectRoot = [Environment]::CurrentDirectory
|
||||
}
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
$PlanRoot = Join-Path $ProjectRoot ".planning"
|
||||
$ActiveFile = Join-Path $PlanRoot ".active_plan"
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
|
||||
# Resolve-Path can retain a junction's spelling. Like resolve-plan-dir.ps1,
|
||||
# open the actual filesystem object before checking the project boundary.
|
||||
# The Windows handle supports both directories and task_plan.md files.
|
||||
function Get-FinalPath {
|
||||
param([string]$Path)
|
||||
if (-not ("PwfPlanListingNative" -as [type])) {
|
||||
Add-Type -ErrorAction Stop -TypeDefinition @'
|
||||
using System;
|
||||
using System.ComponentModel;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
using Microsoft.Win32.SafeHandles;
|
||||
|
||||
public static class PwfPlanListingNative {
|
||||
[DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
|
||||
private static extern SafeFileHandle CreateFileW(
|
||||
string name, uint access, uint share, IntPtr security,
|
||||
uint creation, uint flags, IntPtr template);
|
||||
[DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
|
||||
private static extern uint GetFinalPathNameByHandleW(
|
||||
SafeFileHandle handle, StringBuilder path, uint length, uint flags);
|
||||
[DllImport("libc", SetLastError = true)]
|
||||
private static extern IntPtr realpath(string path, IntPtr resolved);
|
||||
[DllImport("libc")]
|
||||
private static extern void free(IntPtr pointer);
|
||||
|
||||
public static string FinalPath(string path) {
|
||||
if (Environment.OSVersion.Platform != PlatformID.Win32NT) {
|
||||
IntPtr resolved = realpath(path, IntPtr.Zero);
|
||||
if (resolved == IntPtr.Zero) throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
try { return Marshal.PtrToStringAnsi(resolved); }
|
||||
finally { free(resolved); }
|
||||
}
|
||||
// OPEN_EXISTING, FILE_SHARE_READ | WRITE | DELETE, BACKUP_SEMANTICS.
|
||||
using (SafeFileHandle handle = CreateFileW(
|
||||
path, 0, 7, IntPtr.Zero, 3, 0x02000000, IntPtr.Zero)) {
|
||||
if (handle.IsInvalid) throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
StringBuilder buffer = new StringBuilder(32768);
|
||||
uint length = GetFinalPathNameByHandleW(handle, buffer, (uint)buffer.Capacity, 0);
|
||||
if (length == 0 || length >= buffer.Capacity)
|
||||
throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
string result = buffer.ToString();
|
||||
if (result.StartsWith(@"\\?\UNC\", StringComparison.OrdinalIgnoreCase))
|
||||
return @"\\" + result.Substring(8);
|
||||
if (result.StartsWith(@"\\?\", StringComparison.OrdinalIgnoreCase))
|
||||
return result.Substring(4);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
'@
|
||||
}
|
||||
return [PwfPlanListingNative]::FinalPath($Path)
|
||||
}
|
||||
|
||||
function Test-WithinRoot {
|
||||
param([string]$Path)
|
||||
try {
|
||||
$rootReal = (Get-FinalPath $ProjectRoot).TrimEnd('\', '/')
|
||||
$pathReal = (Get-FinalPath $Path).TrimEnd('\', '/')
|
||||
$comparison = [StringComparison]::Ordinal
|
||||
if ($script:IsWindowsHost) { $comparison = [StringComparison]::OrdinalIgnoreCase }
|
||||
return $pathReal.Equals($rootReal, $comparison) -or
|
||||
$pathReal.StartsWith($rootReal + [IO.Path]::DirectorySeparatorChar, $comparison)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
}
|
||||
|
||||
function Test-ValidSlug {
|
||||
param([string]$Name)
|
||||
return $Name -cmatch '^[A-Za-z0-9_][A-Za-z0-9._-]*\z'
|
||||
}
|
||||
|
||||
function Test-SafeActiveFile {
|
||||
param([switch]$AllowLink)
|
||||
$item = Get-Item -LiteralPath $ActiveFile -Force -ErrorAction SilentlyContinue
|
||||
if (-not $item) { return $false }
|
||||
# Reading may follow a verified in-project link; writing must not.
|
||||
return -not $item.PSIsContainer -and
|
||||
($AllowLink -or (($item.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) -and
|
||||
(Test-WithinRoot $ActiveFile)
|
||||
}
|
||||
|
||||
function Get-CurrentActivePlan {
|
||||
if (-not (Test-SafeActiveFile -AllowLink)) { return "" }
|
||||
try {
|
||||
$current = ([string](Get-Content -LiteralPath $ActiveFile -Raw -Encoding UTF8 -ErrorAction Stop)).Trim([char[]]"`r`n")
|
||||
if (Test-ValidSlug $current) { return $current }
|
||||
} catch { }
|
||||
return ""
|
||||
}
|
||||
|
||||
function Add-PhaseStatus {
|
||||
param([hashtable]$Counts, $Phase)
|
||||
if ($null -eq $Phase) { return }
|
||||
$status = $Phase.Inline
|
||||
if ($Phase.Primary) { $status = $Phase.Primary }
|
||||
if ($status) { $Counts[$status]++ }
|
||||
}
|
||||
|
||||
function Get-PhaseStatus {
|
||||
param([string]$PlanFile)
|
||||
$counts = @{ total = 0; complete = 0; in_progress = 0; pending = 0 }
|
||||
$phase = $null
|
||||
$fence = ""
|
||||
$fenceLength = 0
|
||||
# The shipped translations keep status identifiers in English. Unicode
|
||||
# escapes preserve Windows PowerShell 5.1 compatibility without a BOM.
|
||||
$phaseLabel = '(?:Phase|Fase|\u0627\u0644\u0645\u0631\u062d\u0644\u0629|\u9636\u6bb5|\u968e\u6bb5)'
|
||||
$statusLabel = '(?:Status:|Estado:|\u0627\u0644\u062d\u0627\u0644\u0629:|\u72b6\u6001\uff1a|\u72c0\u614b\uff1a)'
|
||||
# Read once; an empty file is a valid plan with zero phases.
|
||||
$content = [string](Get-Content -LiteralPath $PlanFile -Raw -Encoding UTF8 -ErrorAction Stop)
|
||||
foreach ($line in ($content -split '\r?\n')) {
|
||||
if ($fence) {
|
||||
$closing = '^ {0,3}' + [regex]::Escape($fence) + '{' + $fenceLength + ',}[ \t]*$'
|
||||
if ($line -match $closing) { $fence = "" }
|
||||
continue
|
||||
}
|
||||
if ($line -match '^ {0,3}(`{3,}|~{3,})') {
|
||||
$fence = $Matches[1].Substring(0, 1)
|
||||
$fenceLength = $Matches[1].Length
|
||||
continue
|
||||
}
|
||||
if ($line -cmatch ('^ {0,3}###[ \t]+' + $phaseLabel + '[ \t]+[0-9]+(?:[^0-9A-Za-z_]|$)')) {
|
||||
Add-PhaseStatus $counts $phase
|
||||
$phase = @{ Primary = ""; Inline = "" }
|
||||
$counts.total++
|
||||
if ($line -cmatch '\[(complete|in_progress|pending)\]') {
|
||||
$phase.Inline = $Matches[1]
|
||||
}
|
||||
continue
|
||||
}
|
||||
if ($line -match '^ {0,3}#{1,3}(?:[ \t]+|$)') {
|
||||
Add-PhaseStatus $counts $phase
|
||||
$phase = $null
|
||||
continue
|
||||
}
|
||||
if ($null -ne $phase -and -not $phase.Primary -and
|
||||
$line -cmatch ('^ {0,3}(?:-[ \t]+)?\*\*' + $statusLabel + '\*\*[ \t]+(complete|in_progress|pending)(?:[ \t]|$)')) {
|
||||
$phase.Primary = $Matches[1]
|
||||
}
|
||||
}
|
||||
Add-PhaseStatus $counts $phase
|
||||
return "$($counts.complete)/$($counts.total) complete, $($counts.in_progress) in_progress, $($counts.pending) pending"
|
||||
}
|
||||
|
||||
function Show-PlanList {
|
||||
if (-not (Test-Path -LiteralPath $PlanRoot -PathType Container)) {
|
||||
Write-Output "No planning directory found."
|
||||
return
|
||||
}
|
||||
if (-not (Test-WithinRoot $PlanRoot)) {
|
||||
Write-Error "Error: planning directory is outside the project or cannot be verified."
|
||||
exit 1
|
||||
}
|
||||
$active = Get-CurrentActivePlan
|
||||
Write-Output "Available plans:"
|
||||
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)) {
|
||||
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 }
|
||||
try { $status = Get-PhaseStatus $planFile } catch { continue }
|
||||
$marker = ""
|
||||
if ($plan.Name -ceq $active) { $marker = " [active]" }
|
||||
Write-Output "- $($plan.Name)$marker - $status"
|
||||
$found = $true
|
||||
}
|
||||
if (-not $found) { Write-Output "No named plans found." }
|
||||
}
|
||||
|
||||
if ($Help -or $PlanId -eq "--help" -or $PlanId -eq "-h") {
|
||||
Write-Output "Usage: set-active-plan.ps1 [-List|-l|--list|PLAN_ID]"
|
||||
exit 0
|
||||
}
|
||||
|
||||
if ($List -or $PlanId -eq "--list" -or $PlanId -eq "-l") {
|
||||
if ($List -and $PlanId) {
|
||||
Write-Error "Error: list plans or set PLAN_ID in separate calls."
|
||||
exit 1
|
||||
}
|
||||
Show-PlanList
|
||||
exit 0
|
||||
}
|
||||
|
||||
if ($PlanId -eq "") {
|
||||
if (Test-Path $ActiveFile) {
|
||||
$current = (Get-Content $ActiveFile -Raw -Encoding UTF8).Trim()
|
||||
$current = ""
|
||||
if ((Test-Path -LiteralPath $PlanRoot -PathType Container) -and -not (Test-WithinRoot $PlanRoot)) {
|
||||
Write-Error "Error: planning directory is outside the project or cannot be verified."
|
||||
exit 1
|
||||
}
|
||||
if (Test-WithinRoot $PlanRoot) { $current = Get-CurrentActivePlan }
|
||||
if ($current) {
|
||||
$planDir = Join-Path $PlanRoot $current
|
||||
if ($current -ne "" -and (Test-Path $planDir)) {
|
||||
if ((Test-Path -LiteralPath $planDir -PathType Container) -and (Test-WithinRoot $planDir)) {
|
||||
Write-Output "Active plan: $current"
|
||||
Write-Output "Path: $planDir"
|
||||
} elseif ($current -ne "") {
|
||||
Write-Output "Active plan pointer: $current (directory not found - stale pointer)"
|
||||
} else {
|
||||
Write-Output "No active plan set."
|
||||
Write-Output "Active plan pointer: $current (directory not found or outside project - stale pointer)"
|
||||
}
|
||||
} else {
|
||||
Write-Output "No active plan set."
|
||||
@@ -29,21 +247,53 @@ if ($PlanId -eq "") {
|
||||
exit 0
|
||||
}
|
||||
|
||||
if (-not (Test-ValidSlug $PlanId)) {
|
||||
Write-Error "Error: invalid plan ID. Use letters, numbers, underscores, dots, or hyphens; start with a letter, number, or underscore."
|
||||
exit 1
|
||||
}
|
||||
$PlanDir = Join-Path $PlanRoot $PlanId
|
||||
|
||||
if (-not (Test-Path $PlanDir)) {
|
||||
if (-not (Test-Path -LiteralPath $PlanDir -PathType Container)) {
|
||||
Write-Error "Error: plan directory not found: $PlanDir"
|
||||
Write-Error "Run: init-session.sh `"$PlanId`" to create it, or check .planning\ for available plans."
|
||||
exit 1
|
||||
}
|
||||
|
||||
if (-not (Test-Path $PlanRoot)) {
|
||||
New-Item -ItemType Directory -Path $PlanRoot -Force | Out-Null
|
||||
if (-not (Test-WithinRoot $PlanRoot) -or -not (Test-WithinRoot $PlanDir)) {
|
||||
Write-Error "Error: plan directory must remain within the project."
|
||||
exit 1
|
||||
}
|
||||
$activeItem = Get-Item -LiteralPath $ActiveFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not (Test-SafeActiveFile)) {
|
||||
Write-Error "Error: the active plan pointer must be a regular file within the project."
|
||||
exit 1
|
||||
}
|
||||
|
||||
$utf8NoBom = New-Object System.Text.UTF8Encoding($false)
|
||||
[System.IO.File]::WriteAllText($ActiveFile, $PlanId, $utf8NoBom)
|
||||
|
||||
# Replace the directory entry instead of truncating an existing inode: a
|
||||
# hardlinked pointer must not overwrite another file. The exclusive temporary
|
||||
# file lives beside the pointer, keeping replacement on the same filesystem.
|
||||
$tempFile = Join-Path $PlanRoot ('.active_plan.' + [guid]::NewGuid().ToString('N') + '.tmp')
|
||||
$createdTemp = $false
|
||||
try {
|
||||
$stream = [IO.File]::Open($tempFile, [IO.FileMode]::CreateNew, [IO.FileAccess]::Write, [IO.FileShare]::None)
|
||||
$createdTemp = $true
|
||||
try {
|
||||
$bytes = $utf8NoBom.GetBytes($PlanId)
|
||||
$stream.Write($bytes, 0, $bytes.Length)
|
||||
$stream.Flush()
|
||||
} finally { $stream.Dispose() }
|
||||
if ($activeItem) {
|
||||
[IO.File]::Replace($tempFile, $ActiveFile, [NullString]::Value)
|
||||
} else {
|
||||
[IO.File]::Move($tempFile, $ActiveFile)
|
||||
}
|
||||
} catch {
|
||||
Write-Error "Error: could not set the active plan pointer: $($_.Exception.Message)"
|
||||
exit 1
|
||||
} finally {
|
||||
if ($createdTemp -and (Test-Path -LiteralPath $tempFile)) {
|
||||
Remove-Item -LiteralPath $tempFile -Force -ErrorAction SilentlyContinue
|
||||
}
|
||||
}
|
||||
Write-Output "Active plan set to: $PlanId"
|
||||
Write-Output "Path: $PlanDir"
|
||||
Write-Output ""
|
||||
|
||||
Regular → Executable
+323
-38
@@ -1,50 +1,335 @@
|
||||
#!/bin/sh
|
||||
# planning-with-files: set or display the active plan pointer.
|
||||
#
|
||||
# Usage:
|
||||
# set-active-plan.sh <plan_id> — pin .planning/.active_plan to plan_id
|
||||
# set-active-plan.sh — print the current active plan (if any)
|
||||
#
|
||||
# The active plan is stored in .planning/.active_plan and is read by
|
||||
# resolve-plan-dir.sh when no $PLAN_ID env var is set.
|
||||
|
||||
set -e
|
||||
|
||||
# List saved named plans, show the shared pointer, or change that pointer.
|
||||
# Usage: set-active-plan.sh [--list|-l|PLAN_ID]
|
||||
# Operates on the current project; listing never binds a host or injects data.
|
||||
set -eu
|
||||
PLAN_ROOT="${PWD}/.planning"
|
||||
ACTIVE_FILE="${PLAN_ROOT}/.active_plan"
|
||||
PWF_ROOT_PIN=""
|
||||
|
||||
# No args → show current active plan
|
||||
if [ "${1:-}" = "" ]; then
|
||||
if [ -f "${ACTIVE_FILE}" ]; then
|
||||
plan_id="$(tr -d '\r\n' < "${ACTIVE_FILE}")"
|
||||
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ]; then
|
||||
echo "Active plan: ${plan_id}"
|
||||
echo "Path: ${PLAN_ROOT}/${plan_id}"
|
||||
elif [ -n "${plan_id}" ]; then
|
||||
echo "Active plan pointer: ${plan_id} (directory not found — stale pointer)"
|
||||
else
|
||||
echo "No active plan set."
|
||||
fi
|
||||
# Use the resolver canonicalization policy without running plan selection.
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Pure-sh backslash-to-forward-slash normalizer; result lands in $NORM_OUT.
|
||||
# Windows-native coreutils builds (e.g. C:\Program Files\coreutils on PATH
|
||||
# ahead of Git's usr/bin) canonicalize MSYS-style /c/... input to C:\-style
|
||||
# backslash output. The containment prefix match below is written with forward
|
||||
# slashes, so without this normalization every canonical pair mismatches and
|
||||
# resolution silently fails. On POSIX systems paths contain no backslash and
|
||||
# this is the identity. A literal backslash in a Unix filename normalizes to
|
||||
# "/" and at worst fails containment — the safe direction. No subshell, no
|
||||
# fork: plain parameter expansion in a loop.
|
||||
norm_slashes() {
|
||||
NORM_OUT=""
|
||||
_ns_rest="$1"
|
||||
while :; do
|
||||
case "${_ns_rest}" in
|
||||
*\\*)
|
||||
NORM_OUT="${NORM_OUT}${_ns_rest%%\\*}/"
|
||||
_ns_rest="${_ns_rest#*\\}"
|
||||
;;
|
||||
*)
|
||||
NORM_OUT="${NORM_OUT}${_ns_rest}"
|
||||
break
|
||||
;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
out="$(realpath "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v readlink >/dev/null 2>&1; then
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -I -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment guard (security A1.3): a resolved plan dir must canonicalize to a
|
||||
# path under the project root (the CWD the script runs from). A symlink inside
|
||||
# a valid slug dir pointing at /etc or outside the workspace would otherwise let
|
||||
# the hooks hash and inject an arbitrary file. On any violation we return 1 so
|
||||
# the caller treats the candidate as unresolved and falls back safely.
|
||||
#
|
||||
# The root canonicalizes via the relative token "." rather than the $PWD
|
||||
# string. On some Windows/MSYS setups (8.3 short names, the /tmp mount alias)
|
||||
# realpath("$PWD") and realpath(relative-candidate) resolve through different
|
||||
# code paths and land on differently-spelled-but-equal targets, so the prefix
|
||||
# match below fails and resolution silently goes dark. "." resolves through
|
||||
# the same physical-cwd path candidates already use (same fix inject-plan.sh
|
||||
# received earlier; the resolver kept the $PWD form until now). Both sides are
|
||||
# backslash-normalized before comparison for Windows-native canonicalizers.
|
||||
# The root is computed once per run: the newest-mtime scan calls this guard
|
||||
# per plan dir, and each canonicalize costs a process spawn on Windows.
|
||||
#
|
||||
# With a PWF_PLAN_ROOT pin (issue #212) containment is checked against THAT
|
||||
# root instead of the cwd: candidates arrive ${PWF_PLAN_ROOT}/-prefixed, so
|
||||
# both sides canonicalize through the same path spelling. Unpinned keeps the
|
||||
# relative "." root — byte-identical to the legacy check.
|
||||
ROOT_REAL=""
|
||||
ROOT_REAL_SET=0
|
||||
is_within_root() {
|
||||
candidate="$1"
|
||||
if [ "${ROOT_REAL_SET}" = "0" ]; then
|
||||
ROOT_REAL="$(canonicalize "${PWF_ROOT_PIN:-.}")" || ROOT_REAL=""
|
||||
norm_slashes "${ROOT_REAL}"
|
||||
ROOT_REAL="${NORM_OUT}"
|
||||
ROOT_REAL_SET=1
|
||||
fi
|
||||
# Canonicalize the candidate through its cwd-RELATIVE form whenever it
|
||||
# lives under ${PWD}. The candidate string is built from ${PWD} (an MSYS
|
||||
# long-form spelling), while the root canonicalizes from "." (the process
|
||||
# cwd, which a caller may have set with an 8.3 short-form string). A
|
||||
# Windows-native realpath does not unify those spellings, so canonicalizing
|
||||
# both sides from the same cwd base is the only spelling-stable comparison.
|
||||
# The emitted result keeps the original absolute candidate — only the
|
||||
# containment check uses the relative form.
|
||||
# Pinned resolution skips the rewrite: candidate and root then share the
|
||||
# ${PWF_PLAN_ROOT} spelling, so both canonicalize directly from it.
|
||||
if [ -n "${PWF_ROOT_PIN}" ]; then
|
||||
check_target="${candidate}"
|
||||
else
|
||||
echo "No active plan set."
|
||||
case "${candidate}" in
|
||||
"${PWD}"/*) check_target=".${candidate#"${PWD}"}" ;;
|
||||
*) check_target="${candidate}" ;;
|
||||
esac
|
||||
fi
|
||||
cand_real="$(canonicalize "${check_target}")" || cand_real=""
|
||||
norm_slashes "${cand_real}"
|
||||
cand_real="${NORM_OUT}"
|
||||
if [ -z "${ROOT_REAL}" ] || [ -z "${cand_real}" ]; then
|
||||
# Slug validation blocks textual traversal, but only successful
|
||||
# canonicalization can rule out a symlink/junction escape.
|
||||
return 1
|
||||
fi
|
||||
case "${cand_real}" in
|
||||
"${ROOT_REAL}"|"${ROOT_REAL}"/*) return 0 ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Each phase contributes at most one status. An explicit Status line wins
|
||||
# over an inline heading marker. Fenced examples and unrelated sections are
|
||||
# not phases. Keep this parser aligned with the PowerShell helper.
|
||||
phase_status() {
|
||||
awk '
|
||||
function finish() {
|
||||
if (phase) {
|
||||
status = primary != "" ? primary : inline_status
|
||||
if (status == "complete") complete++
|
||||
else if (status == "in_progress") in_progress++
|
||||
else if (status == "pending") pending++
|
||||
}
|
||||
phase = 0; primary = ""; inline_status = ""
|
||||
}
|
||||
{
|
||||
line = $0
|
||||
sub(/\r$/, "", line)
|
||||
trimmed = line
|
||||
sub(/^ */, "", trimmed)
|
||||
if (line ~ /^ ? ? ?```/ || line ~ /^ ? ? ?~~~/) {
|
||||
marker = substr(trimmed, 1, 1)
|
||||
run = 0
|
||||
while (substr(trimmed, run + 1, 1) == marker) run++
|
||||
if (fence == "") { fence = marker; fence_length = run }
|
||||
else if (marker == fence && run >= fence_length && substr(trimmed, run + 1) ~ /^[ \t]*$/) fence = ""
|
||||
next
|
||||
}
|
||||
if (fence != "") next
|
||||
if (line ~ /^ ? ? ?###[ \t]+(Phase|Fase|المرحلة|阶段|階段)[ \t]+[0-9]+([^0-9A-Za-z_]|$)/) {
|
||||
finish(); phase = 1; total++
|
||||
if (match(line, /\[(complete|in_progress|pending)\]/))
|
||||
inline_status = substr(line, RSTART + 1, RLENGTH - 2)
|
||||
} else if (line ~ /^ ? ? ?(###|##|#)([ \t]|$)/) {
|
||||
finish()
|
||||
} else if (phase && primary == "" && line ~ /^ ? ? ?(-[ \t]+)?\*\*(Status:|Estado:|الحالة:|状态:|狀態:)\*\*[ \t]+(complete|in_progress|pending)([ \t]|$)/) {
|
||||
sub(/^ ? ? ?(-[ \t]+)?\*\*(Status:|Estado:|الحالة:|状态:|狀態:)\*\*[ \t]+/, "", line)
|
||||
sub(/[ \t].*$/, "", line)
|
||||
primary = line
|
||||
}
|
||||
}
|
||||
END {
|
||||
finish()
|
||||
printf "%d/%d complete, %d in_progress, %d pending", complete, total, in_progress, pending
|
||||
}
|
||||
' < "$1"
|
||||
}
|
||||
|
||||
current_active() {
|
||||
if [ -f "${ACTIVE_FILE}" ] && is_within_root "${ACTIVE_FILE}"; then
|
||||
_current="$(tr '\r' '\n' < "${ACTIVE_FILE}")"
|
||||
# Windows editors and older PowerShell defaults can leave a UTF-8 BOM.
|
||||
# Treat it as an encoding marker, not part of the shared plan slug.
|
||||
_utf8_bom="$(printf '\357\273\277')"
|
||||
case "${_current}" in
|
||||
"${_utf8_bom}"*) _current="${_current#"${_utf8_bom}"}" ;;
|
||||
esac
|
||||
slug_is_valid "${_current}" && printf '%s\n' "${_current}"
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
list_plans() {
|
||||
if [ ! -d "${PLAN_ROOT}" ]; then
|
||||
printf '%s\n' 'No planning directory found.'
|
||||
return 0
|
||||
fi
|
||||
if ! is_within_root "${PLAN_ROOT}"; then
|
||||
printf '%s\n' 'Error: planning directory is outside the project or cannot be verified.' >&2
|
||||
return 1
|
||||
fi
|
||||
_active="$(current_active)"
|
||||
_found=0
|
||||
printf '%s\n' 'Available plans:'
|
||||
for _dir in "${PLAN_ROOT}"/*; do
|
||||
[ -d "${_dir}" ] || continue
|
||||
_id="${_dir##*/}"
|
||||
slug_is_valid "${_id}" || continue
|
||||
is_within_root "${_dir}" || continue
|
||||
_plan_file="${_dir}/task_plan.md"
|
||||
[ -f "${_plan_file}" ] && [ -r "${_plan_file}" ] || continue
|
||||
is_within_root "${_plan_file}" || continue
|
||||
_status="$(phase_status "${_plan_file}")" || continue
|
||||
_marker=''
|
||||
if [ "${_id}" = "${_active}" ]; then _marker=' [active]'; fi
|
||||
printf '%s\n' "- ${_id}${_marker} - ${_status}"
|
||||
_found=1
|
||||
done
|
||||
if [ "${_found}" -eq 0 ]; then
|
||||
printf '%s\n' 'No named plans found.'
|
||||
else
|
||||
printf '%s\n' '[active] marks the shared default pointer. Set PLAN_ID to pin a session.'
|
||||
fi
|
||||
}
|
||||
|
||||
if [ "$#" -gt 1 ]; then
|
||||
printf '%s\n' 'Error: list plans or set PLAN_ID in separate calls.' >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
case "${1:-}" in
|
||||
--list|-l) list_plans; exit $? ;;
|
||||
--help|-h)
|
||||
printf '%s\n' 'Usage: set-active-plan.sh [--list|PLAN_ID]' \
|
||||
'Lists saved named plans in the current project without selecting a plan.'
|
||||
exit 0 ;;
|
||||
esac
|
||||
|
||||
if [ "${1:-}" = '' ]; then
|
||||
if [ -d "${PLAN_ROOT}" ] && ! is_within_root "${PLAN_ROOT}"; then
|
||||
printf '%s\n' 'Error: planning directory is outside the project or cannot be verified.' >&2
|
||||
exit 1
|
||||
fi
|
||||
plan_id="$(current_active)"
|
||||
if [ -n "${plan_id}" ] && [ -d "${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)"
|
||||
else
|
||||
printf '%s\n' 'No active plan set.'
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
|
||||
PLAN_ID="$1"
|
||||
PLAN_DIR="${PLAN_ROOT}/${PLAN_ID}"
|
||||
|
||||
if [ ! -d "${PLAN_DIR}" ]; then
|
||||
echo "Error: plan directory not found: ${PLAN_DIR}" >&2
|
||||
echo "Run: init-session.sh \"${PLAN_ID}\" to create it, or check .planning/ for available plans." >&2
|
||||
if ! slug_is_valid "${PLAN_ID}"; then
|
||||
printf '%s\n' 'Error: invalid plan ID. Use a named directory under .planning.' >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mkdir -p "${PLAN_ROOT}"
|
||||
printf "%s\n" "${PLAN_ID}" > "${ACTIVE_FILE}"
|
||||
|
||||
echo "Active plan set to: ${PLAN_ID}"
|
||||
echo "Path: ${PLAN_DIR}"
|
||||
echo ""
|
||||
echo "To pin this terminal session only:"
|
||||
echo " export PLAN_ID=${PLAN_ID}"
|
||||
PLAN_DIR="${PLAN_ROOT}/${PLAN_ID}"
|
||||
if [ ! -d "${PLAN_DIR}" ]; then
|
||||
printf '%s\n' "Error: plan directory not found: ${PLAN_DIR}" \
|
||||
"Run: init-session.sh \"${PLAN_ID}\" to create it, or use --list to see available plans." >&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
|
||||
fi
|
||||
# A pre-existing pointer must itself be a contained regular file before writing.
|
||||
if { [ -e "${ACTIVE_FILE}" ] || [ -L "${ACTIVE_FILE}" ]; } &&
|
||||
{ [ -L "${ACTIVE_FILE}" ] || [ ! -f "${ACTIVE_FILE}" ] || ! is_within_root "${ACTIVE_FILE}"; }; then
|
||||
printf '%s\n' 'Error: active plan pointer is not a safe file inside the project.' >&2
|
||||
exit 1
|
||||
fi
|
||||
# Replace the pointer atomically instead of truncating a possible hardlink.
|
||||
# mktemp creates a private, exclusive file beside the destination.
|
||||
temp_file="$(mktemp "${PLAN_ROOT}/.active_plan.XXXXXX")" || {
|
||||
printf '%s\n' 'Error: could not create the active plan pointer.' >&2
|
||||
exit 1
|
||||
}
|
||||
trap 'rm -f "${temp_file}"' EXIT
|
||||
trap 'exit 1' HUP INT TERM
|
||||
printf '%s\n' "${PLAN_ID}" > "${temp_file}"
|
||||
if ! mv -f "${temp_file}" "${ACTIVE_FILE}"; then
|
||||
printf '%s\n' 'Error: could not replace the active plan pointer.' >&2
|
||||
exit 1
|
||||
fi
|
||||
trap - EXIT HUP INT TERM
|
||||
printf '%s\n' "Active plan set to: ${PLAN_ID}" "Path: ${PLAN_DIR}" '' \
|
||||
'To pin this terminal session only:' " export PLAN_ID=${PLAN_ID}"
|
||||
|
||||
@@ -18,7 +18,7 @@ CURRENT_PHASE=$(grep -m1 "^## Current Phase" "$PLAN_FILE" 2>/dev/null || grep -m
|
||||
|
||||
if [ -n "$CURRENT_PHASE" ]; then
|
||||
PYTHON=$(command -v python3 || command -v python)
|
||||
ESCAPED=$($PYTHON -c "import sys,json; print(json.dumps(sys.stdin.read(), ensure_ascii=False))" <<< "[planning-with-files] Current: $CURRENT_PHASE" 2>/dev/null || echo "\"\"")
|
||||
ESCAPED=$($PYTHON -I -X utf8 -c "import sys,json; print(json.dumps(sys.stdin.read(), ensure_ascii=False))" <<< "[planning-with-files] Current: $CURRENT_PHASE" 2>/dev/null || echo "\"\"")
|
||||
printf '%s\n' "{\"additionalContext\":$ESCAPED}"
|
||||
else
|
||||
echo '{}'
|
||||
|
||||
@@ -21,7 +21,7 @@ fi
|
||||
|
||||
PYTHON=$(command -v python3 || command -v python)
|
||||
if [ -n "$PYTHON" ]; then
|
||||
ESCAPED=$($PYTHON -c "import sys,json; print(json.dumps(sys.stdin.read(), ensure_ascii=False))" <<< "$CONTEXT" 2>/dev/null)
|
||||
ESCAPED=$($PYTHON -I -X utf8 -c "import sys,json; print(json.dumps(sys.stdin.read(), ensure_ascii=False))" <<< "$CONTEXT" 2>/dev/null)
|
||||
if [ -n "$ESCAPED" ] && [ "$ESCAPED" != "\"\"" ]; then
|
||||
printf '%s\n' "{\"systemMessage\":$ESCAPED}"
|
||||
exit 0
|
||||
|
||||
@@ -18,7 +18,7 @@ if [ -f "$SCRIPT_DIR/check-complete.sh" ]; then
|
||||
RESULT=$(sh "$SCRIPT_DIR/check-complete.sh" 2>/dev/null || true)
|
||||
if [ -n "$RESULT" ]; then
|
||||
PYTHON=$(command -v python3 || command -v python)
|
||||
ESCAPED=$($PYTHON -c "import sys,json; print(json.dumps(sys.stdin.read(), ensure_ascii=False))" <<< "$RESULT" 2>/dev/null || echo "\"\"")
|
||||
ESCAPED=$($PYTHON -I -X utf8 -c "import sys,json; print(json.dumps(sys.stdin.read(), ensure_ascii=False))" <<< "$RESULT" 2>/dev/null || echo "\"\"")
|
||||
printf '%s\n' "{\"systemMessage\":$ESCAPED}"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
@@ -19,11 +19,11 @@ fi
|
||||
PYTHON=$(command -v python3 || command -v python)
|
||||
CATCHUP=""
|
||||
if [ -n "$PYTHON" ] && [ -f "$SCRIPT_DIR/session-catchup.py" ]; then
|
||||
CATCHUP=$($PYTHON "$SCRIPT_DIR/session-catchup.py" --no-history "$(pwd)" 2>/dev/null || true)
|
||||
CATCHUP=$($PYTHON -I -X utf8 "$SCRIPT_DIR/session-catchup.py" --no-history "$(pwd)" 2>/dev/null || true)
|
||||
fi
|
||||
|
||||
if [ -n "$CATCHUP" ]; then
|
||||
ESCAPED=$($PYTHON -c "import sys,json; print(json.dumps(sys.stdin.read(), ensure_ascii=False))" <<< "$CATCHUP" 2>/dev/null || echo "\"[planning-with-files] Session recovery data available. Read task_plan.md, progress.md, and findings.md.\"")
|
||||
ESCAPED=$($PYTHON -I -X utf8 -c "import sys,json; print(json.dumps(sys.stdin.read(), ensure_ascii=False))" <<< "$CATCHUP" 2>/dev/null || echo "\"[planning-with-files] Session recovery data available. Read task_plan.md, progress.md, and findings.md.\"")
|
||||
printf '%s\n' "{\"hookSpecificOutput\":{\"additionalContext\":$ESCAPED}}"
|
||||
else
|
||||
echo '{"hookSpecificOutput":{"additionalContext":"[planning-with-files] Active plan detected. Read task_plan.md, progress.md, and findings.md before proceeding."}}'
|
||||
|
||||
@@ -182,32 +182,36 @@ Helper scripts for automation:
|
||||
|
||||
- `scripts/init-session.sh` — Initialize planning files. With a name arg, creates an isolated plan under `.planning/YYYY-MM-DD-<slug>/` for parallel task workflows. Without args, writes `task_plan.md` at project root (legacy mode, backward-compatible).
|
||||
- `scripts/set-active-plan.sh` — Switch the active plan pointer (`.planning/.active_plan`). Run with a plan ID to switch; run without args to show which plan is current.
|
||||
- `scripts/resolve-plan-dir.sh` — Resolve the active plan directory. A set `$PLAN_ID` is a binding: it resolves or resolution stops, never another plan (issue #237). With no `$PLAN_ID`, checks `.planning/.active_plan`, then newest plan dir by mtime, then falls back to project root (legacy). Used internally by hooks.
|
||||
- `scripts/resolve-plan-dir.sh` — Resolve the active plan directory. A set `$PLAN_ID` is a binding: it resolves or resolution stops, never another plan (issue #237). With no `$PLAN_ID`, multiple named plans refuse selection. A single named plan may use `.planning/.active_plan` or discovery by mtime; otherwise resolution falls back to the project root (legacy). Used internally by hooks.
|
||||
- `scripts/check-complete.sh` — Verify all phases in the active plan are complete.
|
||||
- `scripts/session-catchup.py`: Explicit same-project session-record aggregation or bounded replay (`--metadata` / `--replay`); bare invocation does not access host history. OpenCode uses its read-only SQLite store.
|
||||
- `scripts/attest-plan.sh` (and `.ps1`) — Lock the current `task_plan.md` content with a SHA-256 attestation (v2.37.0). Use `--show` to print the stored hash, `--clear` to remove the attestation.
|
||||
|
||||
### List saved plans
|
||||
|
||||
To find a task before resuming it, run `sh "<skill-dir>/scripts/set-active-plan.sh" --list` or, in Windows PowerShell, `& "<skill-dir>/scripts/set-active-plan.ps1" -List`. Replace `<skill-dir>` with this installed skill directory and keep your current directory at the project root.
|
||||
|
||||
This read-only command lists named plans and phase progress under the current directory's `.planning/`. `[active]` marks the shared default pointer; it does not bind a session. Concurrent tasks still require each host's `PLAN_ID` or separate worktrees.
|
||||
|
||||
### Parallel task workflow
|
||||
|
||||
When working on multiple tasks in the same repo simultaneously:
|
||||
For concurrent tasks, initialize a named plan and pin each host before starting it. Set `SKILL_DIR` to the installed skill directory in each terminal and keep your current directory at the project root:
|
||||
|
||||
```bash
|
||||
# Start task A
|
||||
./scripts/init-session.sh "Backend Refactor"
|
||||
# → .planning/2026-01-10-backend-refactor/task_plan.md
|
||||
# Terminal A: use the exact PLAN_ID printed by initialization.
|
||||
sh "$SKILL_DIR/scripts/init-session.sh" "Backend Refactor"
|
||||
export PLAN_ID=2026-09-13-backend-refactor
|
||||
# Start the first agent from this terminal after setting PLAN_ID.
|
||||
|
||||
# Start task B in a second terminal
|
||||
./scripts/init-session.sh "Incident Investigation"
|
||||
# → .planning/2026-01-10-incident-investigation/task_plan.md
|
||||
|
||||
# Switch active plan
|
||||
./scripts/set-active-plan.sh 2026-01-10-backend-refactor
|
||||
|
||||
# Or pin a terminal to a specific plan
|
||||
export PLAN_ID=2026-01-10-backend-refactor
|
||||
# Terminal B: use the different PLAN_ID printed for this task.
|
||||
sh "$SKILL_DIR/scripts/init-session.sh" "Incident Investigation"
|
||||
export PLAN_ID=2026-09-13-incident-investigation
|
||||
# Start the second agent from this terminal after setting PLAN_ID.
|
||||
```
|
||||
|
||||
Each session reads from its own isolated plan directory.
|
||||
The IDs are examples; use the IDs printed by your initialization commands. In PowerShell, set `$env:PLAN_ID` before starting the host. Setting it inside an already-running agent's tool subprocess does not change the parent host's environment. Use separate worktrees if the host cannot be pinned per task.
|
||||
|
||||
Use `set-active-plan` for sequential switching of the shared default pointer. Concurrent sessions need their own `PLAN_ID` even when the listing shows `[active]`.
|
||||
|
||||
## Advanced Topics
|
||||
|
||||
|
||||
@@ -404,6 +404,7 @@ function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
$resolvedDir = @(& $resolver | Where-Object { $_ }) | Select-Object -First 1
|
||||
if (-not $resolvedDir -and ((& $resolver -CheckAmbiguity) -eq "PWF_PLAN_AMBIGUOUS_V1")) { return $null }
|
||||
if ($resolvedDir) {
|
||||
$planFile = Join-Path $resolvedDir "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $planFile -ExpectedDirectory $resolvedDir)
|
||||
|
||||
@@ -45,6 +45,10 @@ resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
plan_dir="$(sh "${RESOLVER}" 2>/dev/null)"
|
||||
if [ -z "$plan_dir" ] && [ "$(sh "${RESOLVER}" --check-ambiguity 2>/dev/null)" = "PWF_PLAN_AMBIGUOUS_V1" ]; then
|
||||
printf "[plan-attest] Multiple plans are available. Set PLAN_ID=<slug>; nothing was attested.\n" >&2
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
if [ -n "${plan_dir}" ] && [ -f "${plan_dir}/task_plan.md" ]; then
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
|
||||
@@ -35,6 +35,7 @@ if ($PlanFile -ne "") {
|
||||
try {
|
||||
$resolvedDir = (& $resolver 2>$null | Select-Object -First 1)
|
||||
if ($null -eq $resolvedDir) { $resolvedDir = "" }
|
||||
if (-not $resolvedDir -and ((& $resolver -CheckAmbiguity) -eq "PWF_PLAN_AMBIGUOUS_V1")) { exit 0 }
|
||||
} catch {
|
||||
$resolvedDir = ""
|
||||
}
|
||||
|
||||
@@ -56,6 +56,9 @@ else
|
||||
RESOLVED_DIR=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
RESOLVED_DIR="$(sh "${RESOLVER}" 2>/dev/null)"
|
||||
if [ -z "$RESOLVED_DIR" ] && [ "$(sh "${RESOLVER}" --check-ambiguity 2>/dev/null)" = "PWF_PLAN_AMBIGUOUS_V1" ]; then
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
if [ -n "${RESOLVED_DIR}" ] && [ -f "${RESOLVED_DIR}/task_plan.md" ]; then
|
||||
PLAN_FILE="${RESOLVED_DIR}/task_plan.md"
|
||||
|
||||
@@ -13,7 +13,8 @@
|
||||
# junction/symlink escape; slug validation alone blocks textual traversal.
|
||||
|
||||
param(
|
||||
[string]$PlanRoot = (Join-Path (Get-Location) ".planning")
|
||||
[string]$PlanRoot = (Join-Path (Get-Location) ".planning"),
|
||||
[switch]$CheckAmbiguity
|
||||
)
|
||||
|
||||
$projectRoot = (Get-Location).Path
|
||||
@@ -137,6 +138,30 @@ $activeFile = Join-Path $PlanRoot ".active_plan"
|
||||
# at rc=0. Emptiness is the fail-closed signal on this channel, matching
|
||||
# resolve-plan-dir.sh and the PWF_PLAN_ROOT pin. An empty $env:PLAN_ID is
|
||||
# falsy here and still means "unset".
|
||||
# The optional probe distinguishes ambiguity from a legacy-root fallback.
|
||||
# Multiple named plans require PLAN_ID even without a sessions directory.
|
||||
$planCount = 0
|
||||
if (-not $env:PLAN_ID) {
|
||||
if ((Test-Path -LiteralPath (Join-Path $PlanRoot "sessions") -PathType Container) -and
|
||||
(Test-Path -LiteralPath (Join-Path $projectRoot "task_plan.md") -PathType Leaf)) {
|
||||
$planCount = 1
|
||||
}
|
||||
if (Test-Path -LiteralPath $PlanRoot -PathType Container) {
|
||||
foreach ($entry in (Get-ChildItem -LiteralPath $PlanRoot -Directory -ErrorAction SilentlyContinue)) {
|
||||
if ((Test-ValidSlug $entry.Name) -and
|
||||
(Test-Path -LiteralPath (Join-Path $entry.FullName "task_plan.md") -PathType Leaf)) {
|
||||
$planCount++
|
||||
if ($planCount -gt 1) { break }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($CheckAmbiguity) {
|
||||
if ($planCount -gt 1) { Write-Output "PWF_PLAN_AMBIGUOUS_V1" }
|
||||
exit 0
|
||||
}
|
||||
if ($planCount -gt 1) { exit 0 }
|
||||
|
||||
if ($env:PLAN_ID) {
|
||||
if (Test-ValidSlug $env:PLAN_ID) {
|
||||
$candidate = Join-Path $PlanRoot $env:PLAN_ID
|
||||
|
||||
@@ -15,6 +15,13 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Optional probe distinguishes ambiguity from the empty legacy-root result.
|
||||
# Both modes keep stdout data-only and always exit zero.
|
||||
CHECK_AMBIGUITY=0
|
||||
if [ "${1:-}" = "--check-ambiguity" ]; then
|
||||
CHECK_AMBIGUITY=1
|
||||
shift
|
||||
fi
|
||||
PLAN_ROOT="${1:-${PWD}/.planning}"
|
||||
|
||||
# --- PWF_PLAN_ROOT: absolute plan-root binding (issue #212). ---
|
||||
@@ -321,6 +328,29 @@ resolve_latest_dir() {
|
||||
# the fail-closed signal on this channel, exactly as the PWF_PLAN_ROOT guard
|
||||
# above already does it; a non-zero status would kill callers running under
|
||||
# set -e for a condition that is not an internal error.
|
||||
# A shared pointer or mtime is not a per-session binding (issue #240).
|
||||
# Count conservatively, just like injection: slug-valid live plan files.
|
||||
# The legacy root joins the count only when session isolation is armed.
|
||||
PLAN_AMBIGUOUS=0
|
||||
if [ -z "${PLAN_ID:-}" ]; then
|
||||
PLAN_COUNT=0
|
||||
if [ -d "${PLAN_ROOT}/sessions" ] && [ -f "${PWF_ROOT_PIN:-.}/task_plan.md" ]; 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}"
|
||||
slug_is_valid "${plan_candidate_dir##*/}" || continue
|
||||
PLAN_COUNT=$((PLAN_COUNT + 1))
|
||||
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
|
||||
done
|
||||
fi
|
||||
if [ "$CHECK_AMBIGUITY" = "1" ]; then
|
||||
[ "$PLAN_AMBIGUOUS" = "1" ] && printf '%s\n' 'PWF_PLAN_AMBIGUOUS_V1'
|
||||
exit 0
|
||||
fi
|
||||
[ "$PLAN_AMBIGUOUS" = "1" ] && exit 0
|
||||
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
resolve_from_env && exit 0
|
||||
exit 0
|
||||
|
||||
Regular → Executable
+266
-16
@@ -1,27 +1,245 @@
|
||||
# planning-with-files: set or display the active plan pointer (PowerShell).
|
||||
# planning-with-files: set, display, or list the active plan pointer (PowerShell).
|
||||
#
|
||||
# Usage:
|
||||
# .\set-active-plan.ps1 <plan_id> - pin .planning\.active_plan to plan_id
|
||||
# .\set-active-plan.ps1 - print the current active plan (if any)
|
||||
# .\set-active-plan.ps1 -List - list available named plans and phase counts
|
||||
# .\set-active-plan.ps1 --list - equivalent to -List and -l
|
||||
|
||||
param(
|
||||
[string]$PlanId = ""
|
||||
[Parameter(Position = 0)]
|
||||
[string]$PlanId = "",
|
||||
[Alias('l', '-list')]
|
||||
[switch]$List,
|
||||
[Alias('h', '-help')]
|
||||
[switch]$Help
|
||||
)
|
||||
|
||||
$PlanRoot = Join-Path (Get-Location) ".planning"
|
||||
$ProjectRoot = (Get-Location).Path
|
||||
# Windows PowerShell 5.1 can silently change directories when -File inherits
|
||||
# a cwd containing wildcard characters. Recover that physical cwd only for a
|
||||
# direct invocation of this script; interactive Set-Location remains primary.
|
||||
if ($PSVersionTable.PSVersion.Major -eq 5 -and
|
||||
[System.Management.Automation.WildcardPattern]::ContainsWildcardCharacters([Environment]::CurrentDirectory)) {
|
||||
$processArgs = [Environment]::GetCommandLineArgs()
|
||||
for ($index = 0; $index -lt ($processArgs.Length - 1); $index++) {
|
||||
if ($processArgs[$index] -ieq '-File') {
|
||||
$entryScript = $processArgs[$index + 1]
|
||||
if (-not [IO.Path]::IsPathRooted($entryScript)) {
|
||||
$entryScript = Join-Path ([Environment]::CurrentDirectory) $entryScript
|
||||
}
|
||||
if ([IO.Path]::GetFullPath($entryScript) -eq [IO.Path]::GetFullPath($PSCommandPath)) {
|
||||
$ProjectRoot = [Environment]::CurrentDirectory
|
||||
}
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
$PlanRoot = Join-Path $ProjectRoot ".planning"
|
||||
$ActiveFile = Join-Path $PlanRoot ".active_plan"
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
|
||||
# Resolve-Path can retain a junction's spelling. Like resolve-plan-dir.ps1,
|
||||
# open the actual filesystem object before checking the project boundary.
|
||||
# The Windows handle supports both directories and task_plan.md files.
|
||||
function Get-FinalPath {
|
||||
param([string]$Path)
|
||||
if (-not ("PwfPlanListingNative" -as [type])) {
|
||||
Add-Type -ErrorAction Stop -TypeDefinition @'
|
||||
using System;
|
||||
using System.ComponentModel;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
using Microsoft.Win32.SafeHandles;
|
||||
|
||||
public static class PwfPlanListingNative {
|
||||
[DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
|
||||
private static extern SafeFileHandle CreateFileW(
|
||||
string name, uint access, uint share, IntPtr security,
|
||||
uint creation, uint flags, IntPtr template);
|
||||
[DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
|
||||
private static extern uint GetFinalPathNameByHandleW(
|
||||
SafeFileHandle handle, StringBuilder path, uint length, uint flags);
|
||||
[DllImport("libc", SetLastError = true)]
|
||||
private static extern IntPtr realpath(string path, IntPtr resolved);
|
||||
[DllImport("libc")]
|
||||
private static extern void free(IntPtr pointer);
|
||||
|
||||
public static string FinalPath(string path) {
|
||||
if (Environment.OSVersion.Platform != PlatformID.Win32NT) {
|
||||
IntPtr resolved = realpath(path, IntPtr.Zero);
|
||||
if (resolved == IntPtr.Zero) throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
try { return Marshal.PtrToStringAnsi(resolved); }
|
||||
finally { free(resolved); }
|
||||
}
|
||||
// OPEN_EXISTING, FILE_SHARE_READ | WRITE | DELETE, BACKUP_SEMANTICS.
|
||||
using (SafeFileHandle handle = CreateFileW(
|
||||
path, 0, 7, IntPtr.Zero, 3, 0x02000000, IntPtr.Zero)) {
|
||||
if (handle.IsInvalid) throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
StringBuilder buffer = new StringBuilder(32768);
|
||||
uint length = GetFinalPathNameByHandleW(handle, buffer, (uint)buffer.Capacity, 0);
|
||||
if (length == 0 || length >= buffer.Capacity)
|
||||
throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
string result = buffer.ToString();
|
||||
if (result.StartsWith(@"\\?\UNC\", StringComparison.OrdinalIgnoreCase))
|
||||
return @"\\" + result.Substring(8);
|
||||
if (result.StartsWith(@"\\?\", StringComparison.OrdinalIgnoreCase))
|
||||
return result.Substring(4);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
'@
|
||||
}
|
||||
return [PwfPlanListingNative]::FinalPath($Path)
|
||||
}
|
||||
|
||||
function Test-WithinRoot {
|
||||
param([string]$Path)
|
||||
try {
|
||||
$rootReal = (Get-FinalPath $ProjectRoot).TrimEnd('\', '/')
|
||||
$pathReal = (Get-FinalPath $Path).TrimEnd('\', '/')
|
||||
$comparison = [StringComparison]::Ordinal
|
||||
if ($script:IsWindowsHost) { $comparison = [StringComparison]::OrdinalIgnoreCase }
|
||||
return $pathReal.Equals($rootReal, $comparison) -or
|
||||
$pathReal.StartsWith($rootReal + [IO.Path]::DirectorySeparatorChar, $comparison)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
}
|
||||
|
||||
function Test-ValidSlug {
|
||||
param([string]$Name)
|
||||
return $Name -cmatch '^[A-Za-z0-9_][A-Za-z0-9._-]*\z'
|
||||
}
|
||||
|
||||
function Test-SafeActiveFile {
|
||||
param([switch]$AllowLink)
|
||||
$item = Get-Item -LiteralPath $ActiveFile -Force -ErrorAction SilentlyContinue
|
||||
if (-not $item) { return $false }
|
||||
# Reading may follow a verified in-project link; writing must not.
|
||||
return -not $item.PSIsContainer -and
|
||||
($AllowLink -or (($item.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) -and
|
||||
(Test-WithinRoot $ActiveFile)
|
||||
}
|
||||
|
||||
function Get-CurrentActivePlan {
|
||||
if (-not (Test-SafeActiveFile -AllowLink)) { return "" }
|
||||
try {
|
||||
$current = ([string](Get-Content -LiteralPath $ActiveFile -Raw -Encoding UTF8 -ErrorAction Stop)).Trim([char[]]"`r`n")
|
||||
if (Test-ValidSlug $current) { return $current }
|
||||
} catch { }
|
||||
return ""
|
||||
}
|
||||
|
||||
function Add-PhaseStatus {
|
||||
param([hashtable]$Counts, $Phase)
|
||||
if ($null -eq $Phase) { return }
|
||||
$status = $Phase.Inline
|
||||
if ($Phase.Primary) { $status = $Phase.Primary }
|
||||
if ($status) { $Counts[$status]++ }
|
||||
}
|
||||
|
||||
function Get-PhaseStatus {
|
||||
param([string]$PlanFile)
|
||||
$counts = @{ total = 0; complete = 0; in_progress = 0; pending = 0 }
|
||||
$phase = $null
|
||||
$fence = ""
|
||||
$fenceLength = 0
|
||||
# The shipped translations keep status identifiers in English. Unicode
|
||||
# escapes preserve Windows PowerShell 5.1 compatibility without a BOM.
|
||||
$phaseLabel = '(?:Phase|Fase|\u0627\u0644\u0645\u0631\u062d\u0644\u0629|\u9636\u6bb5|\u968e\u6bb5)'
|
||||
$statusLabel = '(?:Status:|Estado:|\u0627\u0644\u062d\u0627\u0644\u0629:|\u72b6\u6001\uff1a|\u72c0\u614b\uff1a)'
|
||||
# Read once; an empty file is a valid plan with zero phases.
|
||||
$content = [string](Get-Content -LiteralPath $PlanFile -Raw -Encoding UTF8 -ErrorAction Stop)
|
||||
foreach ($line in ($content -split '\r?\n')) {
|
||||
if ($fence) {
|
||||
$closing = '^ {0,3}' + [regex]::Escape($fence) + '{' + $fenceLength + ',}[ \t]*$'
|
||||
if ($line -match $closing) { $fence = "" }
|
||||
continue
|
||||
}
|
||||
if ($line -match '^ {0,3}(`{3,}|~{3,})') {
|
||||
$fence = $Matches[1].Substring(0, 1)
|
||||
$fenceLength = $Matches[1].Length
|
||||
continue
|
||||
}
|
||||
if ($line -cmatch ('^ {0,3}###[ \t]+' + $phaseLabel + '[ \t]+[0-9]+(?:[^0-9A-Za-z_]|$)')) {
|
||||
Add-PhaseStatus $counts $phase
|
||||
$phase = @{ Primary = ""; Inline = "" }
|
||||
$counts.total++
|
||||
if ($line -cmatch '\[(complete|in_progress|pending)\]') {
|
||||
$phase.Inline = $Matches[1]
|
||||
}
|
||||
continue
|
||||
}
|
||||
if ($line -match '^ {0,3}#{1,3}(?:[ \t]+|$)') {
|
||||
Add-PhaseStatus $counts $phase
|
||||
$phase = $null
|
||||
continue
|
||||
}
|
||||
if ($null -ne $phase -and -not $phase.Primary -and
|
||||
$line -cmatch ('^ {0,3}(?:-[ \t]+)?\*\*' + $statusLabel + '\*\*[ \t]+(complete|in_progress|pending)(?:[ \t]|$)')) {
|
||||
$phase.Primary = $Matches[1]
|
||||
}
|
||||
}
|
||||
Add-PhaseStatus $counts $phase
|
||||
return "$($counts.complete)/$($counts.total) complete, $($counts.in_progress) in_progress, $($counts.pending) pending"
|
||||
}
|
||||
|
||||
function Show-PlanList {
|
||||
if (-not (Test-Path -LiteralPath $PlanRoot -PathType Container)) {
|
||||
Write-Output "No planning directory found."
|
||||
return
|
||||
}
|
||||
if (-not (Test-WithinRoot $PlanRoot)) {
|
||||
Write-Error "Error: planning directory is outside the project or cannot be verified."
|
||||
exit 1
|
||||
}
|
||||
$active = Get-CurrentActivePlan
|
||||
Write-Output "Available plans:"
|
||||
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)) {
|
||||
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 }
|
||||
try { $status = Get-PhaseStatus $planFile } catch { continue }
|
||||
$marker = ""
|
||||
if ($plan.Name -ceq $active) { $marker = " [active]" }
|
||||
Write-Output "- $($plan.Name)$marker - $status"
|
||||
$found = $true
|
||||
}
|
||||
if (-not $found) { Write-Output "No named plans found." }
|
||||
}
|
||||
|
||||
if ($Help -or $PlanId -eq "--help" -or $PlanId -eq "-h") {
|
||||
Write-Output "Usage: set-active-plan.ps1 [-List|-l|--list|PLAN_ID]"
|
||||
exit 0
|
||||
}
|
||||
|
||||
if ($List -or $PlanId -eq "--list" -or $PlanId -eq "-l") {
|
||||
if ($List -and $PlanId) {
|
||||
Write-Error "Error: list plans or set PLAN_ID in separate calls."
|
||||
exit 1
|
||||
}
|
||||
Show-PlanList
|
||||
exit 0
|
||||
}
|
||||
|
||||
if ($PlanId -eq "") {
|
||||
if (Test-Path $ActiveFile) {
|
||||
$current = (Get-Content $ActiveFile -Raw -Encoding UTF8).Trim()
|
||||
$current = ""
|
||||
if ((Test-Path -LiteralPath $PlanRoot -PathType Container) -and -not (Test-WithinRoot $PlanRoot)) {
|
||||
Write-Error "Error: planning directory is outside the project or cannot be verified."
|
||||
exit 1
|
||||
}
|
||||
if (Test-WithinRoot $PlanRoot) { $current = Get-CurrentActivePlan }
|
||||
if ($current) {
|
||||
$planDir = Join-Path $PlanRoot $current
|
||||
if ($current -ne "" -and (Test-Path $planDir)) {
|
||||
if ((Test-Path -LiteralPath $planDir -PathType Container) -and (Test-WithinRoot $planDir)) {
|
||||
Write-Output "Active plan: $current"
|
||||
Write-Output "Path: $planDir"
|
||||
} elseif ($current -ne "") {
|
||||
Write-Output "Active plan pointer: $current (directory not found - stale pointer)"
|
||||
} else {
|
||||
Write-Output "No active plan set."
|
||||
Write-Output "Active plan pointer: $current (directory not found or outside project - stale pointer)"
|
||||
}
|
||||
} else {
|
||||
Write-Output "No active plan set."
|
||||
@@ -29,21 +247,53 @@ if ($PlanId -eq "") {
|
||||
exit 0
|
||||
}
|
||||
|
||||
if (-not (Test-ValidSlug $PlanId)) {
|
||||
Write-Error "Error: invalid plan ID. Use letters, numbers, underscores, dots, or hyphens; start with a letter, number, or underscore."
|
||||
exit 1
|
||||
}
|
||||
$PlanDir = Join-Path $PlanRoot $PlanId
|
||||
|
||||
if (-not (Test-Path $PlanDir)) {
|
||||
if (-not (Test-Path -LiteralPath $PlanDir -PathType Container)) {
|
||||
Write-Error "Error: plan directory not found: $PlanDir"
|
||||
Write-Error "Run: init-session.sh `"$PlanId`" to create it, or check .planning\ for available plans."
|
||||
exit 1
|
||||
}
|
||||
|
||||
if (-not (Test-Path $PlanRoot)) {
|
||||
New-Item -ItemType Directory -Path $PlanRoot -Force | Out-Null
|
||||
if (-not (Test-WithinRoot $PlanRoot) -or -not (Test-WithinRoot $PlanDir)) {
|
||||
Write-Error "Error: plan directory must remain within the project."
|
||||
exit 1
|
||||
}
|
||||
$activeItem = Get-Item -LiteralPath $ActiveFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not (Test-SafeActiveFile)) {
|
||||
Write-Error "Error: the active plan pointer must be a regular file within the project."
|
||||
exit 1
|
||||
}
|
||||
|
||||
$utf8NoBom = New-Object System.Text.UTF8Encoding($false)
|
||||
[System.IO.File]::WriteAllText($ActiveFile, $PlanId, $utf8NoBom)
|
||||
|
||||
# Replace the directory entry instead of truncating an existing inode: a
|
||||
# hardlinked pointer must not overwrite another file. The exclusive temporary
|
||||
# file lives beside the pointer, keeping replacement on the same filesystem.
|
||||
$tempFile = Join-Path $PlanRoot ('.active_plan.' + [guid]::NewGuid().ToString('N') + '.tmp')
|
||||
$createdTemp = $false
|
||||
try {
|
||||
$stream = [IO.File]::Open($tempFile, [IO.FileMode]::CreateNew, [IO.FileAccess]::Write, [IO.FileShare]::None)
|
||||
$createdTemp = $true
|
||||
try {
|
||||
$bytes = $utf8NoBom.GetBytes($PlanId)
|
||||
$stream.Write($bytes, 0, $bytes.Length)
|
||||
$stream.Flush()
|
||||
} finally { $stream.Dispose() }
|
||||
if ($activeItem) {
|
||||
[IO.File]::Replace($tempFile, $ActiveFile, [NullString]::Value)
|
||||
} else {
|
||||
[IO.File]::Move($tempFile, $ActiveFile)
|
||||
}
|
||||
} catch {
|
||||
Write-Error "Error: could not set the active plan pointer: $($_.Exception.Message)"
|
||||
exit 1
|
||||
} finally {
|
||||
if ($createdTemp -and (Test-Path -LiteralPath $tempFile)) {
|
||||
Remove-Item -LiteralPath $tempFile -Force -ErrorAction SilentlyContinue
|
||||
}
|
||||
}
|
||||
Write-Output "Active plan set to: $PlanId"
|
||||
Write-Output "Path: $PlanDir"
|
||||
Write-Output ""
|
||||
|
||||
Regular → Executable
+323
-38
@@ -1,50 +1,335 @@
|
||||
#!/bin/sh
|
||||
# planning-with-files: set or display the active plan pointer.
|
||||
#
|
||||
# Usage:
|
||||
# set-active-plan.sh <plan_id> — pin .planning/.active_plan to plan_id
|
||||
# set-active-plan.sh — print the current active plan (if any)
|
||||
#
|
||||
# The active plan is stored in .planning/.active_plan and is read by
|
||||
# resolve-plan-dir.sh when no $PLAN_ID env var is set.
|
||||
|
||||
set -e
|
||||
|
||||
# List saved named plans, show the shared pointer, or change that pointer.
|
||||
# Usage: set-active-plan.sh [--list|-l|PLAN_ID]
|
||||
# Operates on the current project; listing never binds a host or injects data.
|
||||
set -eu
|
||||
PLAN_ROOT="${PWD}/.planning"
|
||||
ACTIVE_FILE="${PLAN_ROOT}/.active_plan"
|
||||
PWF_ROOT_PIN=""
|
||||
|
||||
# No args → show current active plan
|
||||
if [ "${1:-}" = "" ]; then
|
||||
if [ -f "${ACTIVE_FILE}" ]; then
|
||||
plan_id="$(tr -d '\r\n' < "${ACTIVE_FILE}")"
|
||||
if [ -n "${plan_id}" ] && [ -d "${PLAN_ROOT}/${plan_id}" ]; then
|
||||
echo "Active plan: ${plan_id}"
|
||||
echo "Path: ${PLAN_ROOT}/${plan_id}"
|
||||
elif [ -n "${plan_id}" ]; then
|
||||
echo "Active plan pointer: ${plan_id} (directory not found — stale pointer)"
|
||||
else
|
||||
echo "No active plan set."
|
||||
fi
|
||||
# Use the resolver canonicalization policy without running plan selection.
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Pure-sh backslash-to-forward-slash normalizer; result lands in $NORM_OUT.
|
||||
# Windows-native coreutils builds (e.g. C:\Program Files\coreutils on PATH
|
||||
# ahead of Git's usr/bin) canonicalize MSYS-style /c/... input to C:\-style
|
||||
# backslash output. The containment prefix match below is written with forward
|
||||
# slashes, so without this normalization every canonical pair mismatches and
|
||||
# resolution silently fails. On POSIX systems paths contain no backslash and
|
||||
# this is the identity. A literal backslash in a Unix filename normalizes to
|
||||
# "/" and at worst fails containment — the safe direction. No subshell, no
|
||||
# fork: plain parameter expansion in a loop.
|
||||
norm_slashes() {
|
||||
NORM_OUT=""
|
||||
_ns_rest="$1"
|
||||
while :; do
|
||||
case "${_ns_rest}" in
|
||||
*\\*)
|
||||
NORM_OUT="${NORM_OUT}${_ns_rest%%\\*}/"
|
||||
_ns_rest="${_ns_rest#*\\}"
|
||||
;;
|
||||
*)
|
||||
NORM_OUT="${NORM_OUT}${_ns_rest}"
|
||||
break
|
||||
;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
out="$(realpath "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v readlink >/dev/null 2>&1; then
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -I -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment guard (security A1.3): a resolved plan dir must canonicalize to a
|
||||
# path under the project root (the CWD the script runs from). A symlink inside
|
||||
# a valid slug dir pointing at /etc or outside the workspace would otherwise let
|
||||
# the hooks hash and inject an arbitrary file. On any violation we return 1 so
|
||||
# the caller treats the candidate as unresolved and falls back safely.
|
||||
#
|
||||
# The root canonicalizes via the relative token "." rather than the $PWD
|
||||
# string. On some Windows/MSYS setups (8.3 short names, the /tmp mount alias)
|
||||
# realpath("$PWD") and realpath(relative-candidate) resolve through different
|
||||
# code paths and land on differently-spelled-but-equal targets, so the prefix
|
||||
# match below fails and resolution silently goes dark. "." resolves through
|
||||
# the same physical-cwd path candidates already use (same fix inject-plan.sh
|
||||
# received earlier; the resolver kept the $PWD form until now). Both sides are
|
||||
# backslash-normalized before comparison for Windows-native canonicalizers.
|
||||
# The root is computed once per run: the newest-mtime scan calls this guard
|
||||
# per plan dir, and each canonicalize costs a process spawn on Windows.
|
||||
#
|
||||
# With a PWF_PLAN_ROOT pin (issue #212) containment is checked against THAT
|
||||
# root instead of the cwd: candidates arrive ${PWF_PLAN_ROOT}/-prefixed, so
|
||||
# both sides canonicalize through the same path spelling. Unpinned keeps the
|
||||
# relative "." root — byte-identical to the legacy check.
|
||||
ROOT_REAL=""
|
||||
ROOT_REAL_SET=0
|
||||
is_within_root() {
|
||||
candidate="$1"
|
||||
if [ "${ROOT_REAL_SET}" = "0" ]; then
|
||||
ROOT_REAL="$(canonicalize "${PWF_ROOT_PIN:-.}")" || ROOT_REAL=""
|
||||
norm_slashes "${ROOT_REAL}"
|
||||
ROOT_REAL="${NORM_OUT}"
|
||||
ROOT_REAL_SET=1
|
||||
fi
|
||||
# Canonicalize the candidate through its cwd-RELATIVE form whenever it
|
||||
# lives under ${PWD}. The candidate string is built from ${PWD} (an MSYS
|
||||
# long-form spelling), while the root canonicalizes from "." (the process
|
||||
# cwd, which a caller may have set with an 8.3 short-form string). A
|
||||
# Windows-native realpath does not unify those spellings, so canonicalizing
|
||||
# both sides from the same cwd base is the only spelling-stable comparison.
|
||||
# The emitted result keeps the original absolute candidate — only the
|
||||
# containment check uses the relative form.
|
||||
# Pinned resolution skips the rewrite: candidate and root then share the
|
||||
# ${PWF_PLAN_ROOT} spelling, so both canonicalize directly from it.
|
||||
if [ -n "${PWF_ROOT_PIN}" ]; then
|
||||
check_target="${candidate}"
|
||||
else
|
||||
echo "No active plan set."
|
||||
case "${candidate}" in
|
||||
"${PWD}"/*) check_target=".${candidate#"${PWD}"}" ;;
|
||||
*) check_target="${candidate}" ;;
|
||||
esac
|
||||
fi
|
||||
cand_real="$(canonicalize "${check_target}")" || cand_real=""
|
||||
norm_slashes "${cand_real}"
|
||||
cand_real="${NORM_OUT}"
|
||||
if [ -z "${ROOT_REAL}" ] || [ -z "${cand_real}" ]; then
|
||||
# Slug validation blocks textual traversal, but only successful
|
||||
# canonicalization can rule out a symlink/junction escape.
|
||||
return 1
|
||||
fi
|
||||
case "${cand_real}" in
|
||||
"${ROOT_REAL}"|"${ROOT_REAL}"/*) return 0 ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Each phase contributes at most one status. An explicit Status line wins
|
||||
# over an inline heading marker. Fenced examples and unrelated sections are
|
||||
# not phases. Keep this parser aligned with the PowerShell helper.
|
||||
phase_status() {
|
||||
awk '
|
||||
function finish() {
|
||||
if (phase) {
|
||||
status = primary != "" ? primary : inline_status
|
||||
if (status == "complete") complete++
|
||||
else if (status == "in_progress") in_progress++
|
||||
else if (status == "pending") pending++
|
||||
}
|
||||
phase = 0; primary = ""; inline_status = ""
|
||||
}
|
||||
{
|
||||
line = $0
|
||||
sub(/\r$/, "", line)
|
||||
trimmed = line
|
||||
sub(/^ */, "", trimmed)
|
||||
if (line ~ /^ ? ? ?```/ || line ~ /^ ? ? ?~~~/) {
|
||||
marker = substr(trimmed, 1, 1)
|
||||
run = 0
|
||||
while (substr(trimmed, run + 1, 1) == marker) run++
|
||||
if (fence == "") { fence = marker; fence_length = run }
|
||||
else if (marker == fence && run >= fence_length && substr(trimmed, run + 1) ~ /^[ \t]*$/) fence = ""
|
||||
next
|
||||
}
|
||||
if (fence != "") next
|
||||
if (line ~ /^ ? ? ?###[ \t]+(Phase|Fase|المرحلة|阶段|階段)[ \t]+[0-9]+([^0-9A-Za-z_]|$)/) {
|
||||
finish(); phase = 1; total++
|
||||
if (match(line, /\[(complete|in_progress|pending)\]/))
|
||||
inline_status = substr(line, RSTART + 1, RLENGTH - 2)
|
||||
} else if (line ~ /^ ? ? ?(###|##|#)([ \t]|$)/) {
|
||||
finish()
|
||||
} else if (phase && primary == "" && line ~ /^ ? ? ?(-[ \t]+)?\*\*(Status:|Estado:|الحالة:|状态:|狀態:)\*\*[ \t]+(complete|in_progress|pending)([ \t]|$)/) {
|
||||
sub(/^ ? ? ?(-[ \t]+)?\*\*(Status:|Estado:|الحالة:|状态:|狀態:)\*\*[ \t]+/, "", line)
|
||||
sub(/[ \t].*$/, "", line)
|
||||
primary = line
|
||||
}
|
||||
}
|
||||
END {
|
||||
finish()
|
||||
printf "%d/%d complete, %d in_progress, %d pending", complete, total, in_progress, pending
|
||||
}
|
||||
' < "$1"
|
||||
}
|
||||
|
||||
current_active() {
|
||||
if [ -f "${ACTIVE_FILE}" ] && is_within_root "${ACTIVE_FILE}"; then
|
||||
_current="$(tr '\r' '\n' < "${ACTIVE_FILE}")"
|
||||
# Windows editors and older PowerShell defaults can leave a UTF-8 BOM.
|
||||
# Treat it as an encoding marker, not part of the shared plan slug.
|
||||
_utf8_bom="$(printf '\357\273\277')"
|
||||
case "${_current}" in
|
||||
"${_utf8_bom}"*) _current="${_current#"${_utf8_bom}"}" ;;
|
||||
esac
|
||||
slug_is_valid "${_current}" && printf '%s\n' "${_current}"
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
list_plans() {
|
||||
if [ ! -d "${PLAN_ROOT}" ]; then
|
||||
printf '%s\n' 'No planning directory found.'
|
||||
return 0
|
||||
fi
|
||||
if ! is_within_root "${PLAN_ROOT}"; then
|
||||
printf '%s\n' 'Error: planning directory is outside the project or cannot be verified.' >&2
|
||||
return 1
|
||||
fi
|
||||
_active="$(current_active)"
|
||||
_found=0
|
||||
printf '%s\n' 'Available plans:'
|
||||
for _dir in "${PLAN_ROOT}"/*; do
|
||||
[ -d "${_dir}" ] || continue
|
||||
_id="${_dir##*/}"
|
||||
slug_is_valid "${_id}" || continue
|
||||
is_within_root "${_dir}" || continue
|
||||
_plan_file="${_dir}/task_plan.md"
|
||||
[ -f "${_plan_file}" ] && [ -r "${_plan_file}" ] || continue
|
||||
is_within_root "${_plan_file}" || continue
|
||||
_status="$(phase_status "${_plan_file}")" || continue
|
||||
_marker=''
|
||||
if [ "${_id}" = "${_active}" ]; then _marker=' [active]'; fi
|
||||
printf '%s\n' "- ${_id}${_marker} - ${_status}"
|
||||
_found=1
|
||||
done
|
||||
if [ "${_found}" -eq 0 ]; then
|
||||
printf '%s\n' 'No named plans found.'
|
||||
else
|
||||
printf '%s\n' '[active] marks the shared default pointer. Set PLAN_ID to pin a session.'
|
||||
fi
|
||||
}
|
||||
|
||||
if [ "$#" -gt 1 ]; then
|
||||
printf '%s\n' 'Error: list plans or set PLAN_ID in separate calls.' >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
case "${1:-}" in
|
||||
--list|-l) list_plans; exit $? ;;
|
||||
--help|-h)
|
||||
printf '%s\n' 'Usage: set-active-plan.sh [--list|PLAN_ID]' \
|
||||
'Lists saved named plans in the current project without selecting a plan.'
|
||||
exit 0 ;;
|
||||
esac
|
||||
|
||||
if [ "${1:-}" = '' ]; then
|
||||
if [ -d "${PLAN_ROOT}" ] && ! is_within_root "${PLAN_ROOT}"; then
|
||||
printf '%s\n' 'Error: planning directory is outside the project or cannot be verified.' >&2
|
||||
exit 1
|
||||
fi
|
||||
plan_id="$(current_active)"
|
||||
if [ -n "${plan_id}" ] && [ -d "${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)"
|
||||
else
|
||||
printf '%s\n' 'No active plan set.'
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
|
||||
PLAN_ID="$1"
|
||||
PLAN_DIR="${PLAN_ROOT}/${PLAN_ID}"
|
||||
|
||||
if [ ! -d "${PLAN_DIR}" ]; then
|
||||
echo "Error: plan directory not found: ${PLAN_DIR}" >&2
|
||||
echo "Run: init-session.sh \"${PLAN_ID}\" to create it, or check .planning/ for available plans." >&2
|
||||
if ! slug_is_valid "${PLAN_ID}"; then
|
||||
printf '%s\n' 'Error: invalid plan ID. Use a named directory under .planning.' >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mkdir -p "${PLAN_ROOT}"
|
||||
printf "%s\n" "${PLAN_ID}" > "${ACTIVE_FILE}"
|
||||
|
||||
echo "Active plan set to: ${PLAN_ID}"
|
||||
echo "Path: ${PLAN_DIR}"
|
||||
echo ""
|
||||
echo "To pin this terminal session only:"
|
||||
echo " export PLAN_ID=${PLAN_ID}"
|
||||
PLAN_DIR="${PLAN_ROOT}/${PLAN_ID}"
|
||||
if [ ! -d "${PLAN_DIR}" ]; then
|
||||
printf '%s\n' "Error: plan directory not found: ${PLAN_DIR}" \
|
||||
"Run: init-session.sh \"${PLAN_ID}\" to create it, or use --list to see available plans." >&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
|
||||
fi
|
||||
# A pre-existing pointer must itself be a contained regular file before writing.
|
||||
if { [ -e "${ACTIVE_FILE}" ] || [ -L "${ACTIVE_FILE}" ]; } &&
|
||||
{ [ -L "${ACTIVE_FILE}" ] || [ ! -f "${ACTIVE_FILE}" ] || ! is_within_root "${ACTIVE_FILE}"; }; then
|
||||
printf '%s\n' 'Error: active plan pointer is not a safe file inside the project.' >&2
|
||||
exit 1
|
||||
fi
|
||||
# Replace the pointer atomically instead of truncating a possible hardlink.
|
||||
# mktemp creates a private, exclusive file beside the destination.
|
||||
temp_file="$(mktemp "${PLAN_ROOT}/.active_plan.XXXXXX")" || {
|
||||
printf '%s\n' 'Error: could not create the active plan pointer.' >&2
|
||||
exit 1
|
||||
}
|
||||
trap 'rm -f "${temp_file}"' EXIT
|
||||
trap 'exit 1' HUP INT TERM
|
||||
printf '%s\n' "${PLAN_ID}" > "${temp_file}"
|
||||
if ! mv -f "${temp_file}" "${ACTIVE_FILE}"; then
|
||||
printf '%s\n' 'Error: could not replace the active plan pointer.' >&2
|
||||
exit 1
|
||||
fi
|
||||
trap - EXIT HUP INT TERM
|
||||
printf '%s\n' "Active plan set to: ${PLAN_ID}" "Path: ${PLAN_DIR}" '' \
|
||||
'To pin this terminal session only:' " export PLAN_ID=${PLAN_ID}"
|
||||
|
||||
@@ -21,7 +21,7 @@ for _p in /usr/bin/python3 /usr/local/bin/python3 /opt/homebrew/bin/python3; do
|
||||
[ -x "$_p" ] && { PYTHON="$_p"; break; }
|
||||
done
|
||||
[ -z "$PYTHON" ] && PYTHON=$(command -v python3 2>/dev/null || command -v python 2>/dev/null)
|
||||
ERROR_MSG=$(printf '%s\n' "$INPUT" | $PYTHON -c "
|
||||
ERROR_MSG=$(printf '%s\n' "$INPUT" | $PYTHON -I -X utf8 -c "
|
||||
import sys, json
|
||||
try:
|
||||
data = json.load(sys.stdin)
|
||||
@@ -33,7 +33,7 @@ except:
|
||||
|
||||
if [ -n "$ERROR_MSG" ]; then
|
||||
CONTEXT="[planning-with-files] Error detected: ${ERROR_MSG}. Log this error in task_plan.md under Errors Encountered with the attempt number and resolution."
|
||||
ESCAPED=$(printf '%s\n' "$CONTEXT" | $PYTHON -c "import sys,json; print(json.dumps(sys.stdin.read(), ensure_ascii=False))" 2>/dev/null || echo "\"\"")
|
||||
ESCAPED=$(printf '%s\n' "$CONTEXT" | $PYTHON -I -X utf8 -c "import sys,json; print(json.dumps(sys.stdin.read(), ensure_ascii=False))" 2>/dev/null || echo "\"\"")
|
||||
printf '%s\n' "{\"hookSpecificOutput\":{\"hookEventName\":\"ErrorOccurred\",\"additionalContext\":$ESCAPED}}"
|
||||
else
|
||||
echo '{}'
|
||||
|
||||
@@ -31,7 +31,7 @@ for _p in /usr/bin/python3 /usr/local/bin/python3 /opt/homebrew/bin/python3; do
|
||||
[ -x "$_p" ] && { PYTHON="$_p"; break; }
|
||||
done
|
||||
[ -z "$PYTHON" ] && PYTHON=$(command -v python3 2>/dev/null || command -v python 2>/dev/null)
|
||||
ESCAPED=$(echo "$CONTEXT" | $PYTHON -c "import sys,json; print(json.dumps(sys.stdin.read(), ensure_ascii=False))" 2>/dev/null || echo "\"\"")
|
||||
ESCAPED=$(echo "$CONTEXT" | $PYTHON -I -X utf8 -c "import sys,json; print(json.dumps(sys.stdin.read(), ensure_ascii=False))" 2>/dev/null || echo "\"\"")
|
||||
|
||||
printf '%s\n' "{\"hookSpecificOutput\":{\"hookEventName\":\"PreToolUse\",\"permissionDecision\":\"allow\",\"additionalContext\":$ESCAPED}}"
|
||||
exit 0
|
||||
|
||||
@@ -21,7 +21,7 @@ if [ -f "$PLAN_FILE" ]; then
|
||||
# Plan exists: keep catchup zero-history, then read the plan header.
|
||||
CATCHUP=""
|
||||
if [ -n "$PYTHON" ] && [ -f "$SKILL_DIR/scripts/session-catchup.py" ]; then
|
||||
CATCHUP=$($PYTHON "$SKILL_DIR/scripts/session-catchup.py" --no-history "$(pwd)" 2>/dev/null | head -100)
|
||||
CATCHUP=$($PYTHON -I -X utf8 "$SKILL_DIR/scripts/session-catchup.py" --no-history "$(pwd)" 2>/dev/null | head -100)
|
||||
fi
|
||||
|
||||
if [ -n "$CATCHUP" ]; then
|
||||
@@ -43,7 +43,7 @@ if [ -z "$CONTEXT" ]; then
|
||||
fi
|
||||
|
||||
# Escape context for JSON
|
||||
ESCAPED=$(echo "$CONTEXT" | $PYTHON -c "import sys,json; print(json.dumps(sys.stdin.read(), ensure_ascii=False))" 2>/dev/null || echo "\"\"")
|
||||
ESCAPED=$(echo "$CONTEXT" | $PYTHON -I -X utf8 -c "import sys,json; print(json.dumps(sys.stdin.read(), ensure_ascii=False))" 2>/dev/null || echo "\"\"")
|
||||
|
||||
printf '%s\n' "{\"hookSpecificOutput\":{\"hookEventName\":\"SessionStart\",\"additionalContext\":$ESCAPED}}"
|
||||
exit 0
|
||||
|
||||
@@ -29,7 +29,9 @@ jobs:
|
||||
# on ubuntu so GNU-only regressions fail there too.
|
||||
os: [ubuntu-latest, windows-latest, macos-latest]
|
||||
runs-on: ${{ matrix.os }}
|
||||
timeout-minutes: 15
|
||||
# Windows runs the full suite through Git Bash and native PowerShell.
|
||||
# Successful runs already approach 15 minutes; allow runner variance.
|
||||
timeout-minutes: ${{ matrix.os == 'windows-latest' && 30 || 15 }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-python@v5
|
||||
@@ -45,7 +47,7 @@ jobs:
|
||||
# sh.exe on windows-latest).
|
||||
run: python -c "import shutil, sys; sys.exit(0 if shutil.which('sh') else 1)"
|
||||
- name: Run pytest
|
||||
run: python -m pytest tests/ -q
|
||||
run: python -m pytest tests/ -q --durations=20
|
||||
|
||||
vitest:
|
||||
name: vitest (Pi extension)
|
||||
|
||||
@@ -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.17.0"
|
||||
version: "3.18.2"
|
||||
hermes:
|
||||
tags: [planning, long-running-tasks, context-engineering, workflow]
|
||||
---
|
||||
@@ -208,6 +208,14 @@ Helper scripts bundled with this Hermes skill:
|
||||
|
||||
The adapter plugin does not need any other script: plan resolution, injection, attestation checks, the completion gate and the `/pwf` initialization run in Python inside the plugin. The full canonical script surface (attestation helper, ledger, phase status, plan-doctor) ships with the canonical skill for hosts that dispatch shell hooks.
|
||||
|
||||
### List saved plans
|
||||
|
||||
To find a task before resuming it, run `sh "<skill-dir>/scripts/set-active-plan.sh" --list` or, in Windows PowerShell, `& "<skill-dir>/scripts/set-active-plan.ps1" -List`. Replace `<skill-dir>` with this installed skill directory and keep your current directory at the project root.
|
||||
|
||||
This read-only command lists named plans and phase progress under the current directory's `.planning/`. `[active]` marks the shared default pointer; it does not bind a session. Concurrent tasks still require each host's `PLAN_ID` or separate worktrees.
|
||||
|
||||
If your Hermes hub installation omits `.ps1` files, use `--list` with a POSIX shell or obtain the helper from the repository's `.hermes/skills/planning-with-files/scripts/` directory. The Hermes adapter itself does not depend on this helper.
|
||||
|
||||
## Advanced Topics
|
||||
|
||||
- **Manus Principles:** See [reference.md](reference.md)
|
||||
|
||||
@@ -0,0 +1,301 @@
|
||||
# planning-with-files: set, display, or list the active plan pointer (PowerShell).
|
||||
#
|
||||
# Usage:
|
||||
# .\set-active-plan.ps1 <plan_id> - pin .planning\.active_plan to plan_id
|
||||
# .\set-active-plan.ps1 - print the current active plan (if any)
|
||||
# .\set-active-plan.ps1 -List - list available named plans and phase counts
|
||||
# .\set-active-plan.ps1 --list - equivalent to -List and -l
|
||||
|
||||
param(
|
||||
[Parameter(Position = 0)]
|
||||
[string]$PlanId = "",
|
||||
[Alias('l', '-list')]
|
||||
[switch]$List,
|
||||
[Alias('h', '-help')]
|
||||
[switch]$Help
|
||||
)
|
||||
|
||||
$ProjectRoot = (Get-Location).Path
|
||||
# Windows PowerShell 5.1 can silently change directories when -File inherits
|
||||
# a cwd containing wildcard characters. Recover that physical cwd only for a
|
||||
# direct invocation of this script; interactive Set-Location remains primary.
|
||||
if ($PSVersionTable.PSVersion.Major -eq 5 -and
|
||||
[System.Management.Automation.WildcardPattern]::ContainsWildcardCharacters([Environment]::CurrentDirectory)) {
|
||||
$processArgs = [Environment]::GetCommandLineArgs()
|
||||
for ($index = 0; $index -lt ($processArgs.Length - 1); $index++) {
|
||||
if ($processArgs[$index] -ieq '-File') {
|
||||
$entryScript = $processArgs[$index + 1]
|
||||
if (-not [IO.Path]::IsPathRooted($entryScript)) {
|
||||
$entryScript = Join-Path ([Environment]::CurrentDirectory) $entryScript
|
||||
}
|
||||
if ([IO.Path]::GetFullPath($entryScript) -eq [IO.Path]::GetFullPath($PSCommandPath)) {
|
||||
$ProjectRoot = [Environment]::CurrentDirectory
|
||||
}
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
$PlanRoot = Join-Path $ProjectRoot ".planning"
|
||||
$ActiveFile = Join-Path $PlanRoot ".active_plan"
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
|
||||
# Resolve-Path can retain a junction's spelling. Like resolve-plan-dir.ps1,
|
||||
# open the actual filesystem object before checking the project boundary.
|
||||
# The Windows handle supports both directories and task_plan.md files.
|
||||
function Get-FinalPath {
|
||||
param([string]$Path)
|
||||
if (-not ("PwfPlanListingNative" -as [type])) {
|
||||
Add-Type -ErrorAction Stop -TypeDefinition @'
|
||||
using System;
|
||||
using System.ComponentModel;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
using Microsoft.Win32.SafeHandles;
|
||||
|
||||
public static class PwfPlanListingNative {
|
||||
[DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
|
||||
private static extern SafeFileHandle CreateFileW(
|
||||
string name, uint access, uint share, IntPtr security,
|
||||
uint creation, uint flags, IntPtr template);
|
||||
[DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
|
||||
private static extern uint GetFinalPathNameByHandleW(
|
||||
SafeFileHandle handle, StringBuilder path, uint length, uint flags);
|
||||
[DllImport("libc", SetLastError = true)]
|
||||
private static extern IntPtr realpath(string path, IntPtr resolved);
|
||||
[DllImport("libc")]
|
||||
private static extern void free(IntPtr pointer);
|
||||
|
||||
public static string FinalPath(string path) {
|
||||
if (Environment.OSVersion.Platform != PlatformID.Win32NT) {
|
||||
IntPtr resolved = realpath(path, IntPtr.Zero);
|
||||
if (resolved == IntPtr.Zero) throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
try { return Marshal.PtrToStringAnsi(resolved); }
|
||||
finally { free(resolved); }
|
||||
}
|
||||
// OPEN_EXISTING, FILE_SHARE_READ | WRITE | DELETE, BACKUP_SEMANTICS.
|
||||
using (SafeFileHandle handle = CreateFileW(
|
||||
path, 0, 7, IntPtr.Zero, 3, 0x02000000, IntPtr.Zero)) {
|
||||
if (handle.IsInvalid) throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
StringBuilder buffer = new StringBuilder(32768);
|
||||
uint length = GetFinalPathNameByHandleW(handle, buffer, (uint)buffer.Capacity, 0);
|
||||
if (length == 0 || length >= buffer.Capacity)
|
||||
throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
string result = buffer.ToString();
|
||||
if (result.StartsWith(@"\\?\UNC\", StringComparison.OrdinalIgnoreCase))
|
||||
return @"\\" + result.Substring(8);
|
||||
if (result.StartsWith(@"\\?\", StringComparison.OrdinalIgnoreCase))
|
||||
return result.Substring(4);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
'@
|
||||
}
|
||||
return [PwfPlanListingNative]::FinalPath($Path)
|
||||
}
|
||||
|
||||
function Test-WithinRoot {
|
||||
param([string]$Path)
|
||||
try {
|
||||
$rootReal = (Get-FinalPath $ProjectRoot).TrimEnd('\', '/')
|
||||
$pathReal = (Get-FinalPath $Path).TrimEnd('\', '/')
|
||||
$comparison = [StringComparison]::Ordinal
|
||||
if ($script:IsWindowsHost) { $comparison = [StringComparison]::OrdinalIgnoreCase }
|
||||
return $pathReal.Equals($rootReal, $comparison) -or
|
||||
$pathReal.StartsWith($rootReal + [IO.Path]::DirectorySeparatorChar, $comparison)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
}
|
||||
|
||||
function Test-ValidSlug {
|
||||
param([string]$Name)
|
||||
return $Name -cmatch '^[A-Za-z0-9_][A-Za-z0-9._-]*\z'
|
||||
}
|
||||
|
||||
function Test-SafeActiveFile {
|
||||
param([switch]$AllowLink)
|
||||
$item = Get-Item -LiteralPath $ActiveFile -Force -ErrorAction SilentlyContinue
|
||||
if (-not $item) { return $false }
|
||||
# Reading may follow a verified in-project link; writing must not.
|
||||
return -not $item.PSIsContainer -and
|
||||
($AllowLink -or (($item.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) -and
|
||||
(Test-WithinRoot $ActiveFile)
|
||||
}
|
||||
|
||||
function Get-CurrentActivePlan {
|
||||
if (-not (Test-SafeActiveFile -AllowLink)) { return "" }
|
||||
try {
|
||||
$current = ([string](Get-Content -LiteralPath $ActiveFile -Raw -Encoding UTF8 -ErrorAction Stop)).Trim([char[]]"`r`n")
|
||||
if (Test-ValidSlug $current) { return $current }
|
||||
} catch { }
|
||||
return ""
|
||||
}
|
||||
|
||||
function Add-PhaseStatus {
|
||||
param([hashtable]$Counts, $Phase)
|
||||
if ($null -eq $Phase) { return }
|
||||
$status = $Phase.Inline
|
||||
if ($Phase.Primary) { $status = $Phase.Primary }
|
||||
if ($status) { $Counts[$status]++ }
|
||||
}
|
||||
|
||||
function Get-PhaseStatus {
|
||||
param([string]$PlanFile)
|
||||
$counts = @{ total = 0; complete = 0; in_progress = 0; pending = 0 }
|
||||
$phase = $null
|
||||
$fence = ""
|
||||
$fenceLength = 0
|
||||
# The shipped translations keep status identifiers in English. Unicode
|
||||
# escapes preserve Windows PowerShell 5.1 compatibility without a BOM.
|
||||
$phaseLabel = '(?:Phase|Fase|\u0627\u0644\u0645\u0631\u062d\u0644\u0629|\u9636\u6bb5|\u968e\u6bb5)'
|
||||
$statusLabel = '(?:Status:|Estado:|\u0627\u0644\u062d\u0627\u0644\u0629:|\u72b6\u6001\uff1a|\u72c0\u614b\uff1a)'
|
||||
# Read once; an empty file is a valid plan with zero phases.
|
||||
$content = [string](Get-Content -LiteralPath $PlanFile -Raw -Encoding UTF8 -ErrorAction Stop)
|
||||
foreach ($line in ($content -split '\r?\n')) {
|
||||
if ($fence) {
|
||||
$closing = '^ {0,3}' + [regex]::Escape($fence) + '{' + $fenceLength + ',}[ \t]*$'
|
||||
if ($line -match $closing) { $fence = "" }
|
||||
continue
|
||||
}
|
||||
if ($line -match '^ {0,3}(`{3,}|~{3,})') {
|
||||
$fence = $Matches[1].Substring(0, 1)
|
||||
$fenceLength = $Matches[1].Length
|
||||
continue
|
||||
}
|
||||
if ($line -cmatch ('^ {0,3}###[ \t]+' + $phaseLabel + '[ \t]+[0-9]+(?:[^0-9A-Za-z_]|$)')) {
|
||||
Add-PhaseStatus $counts $phase
|
||||
$phase = @{ Primary = ""; Inline = "" }
|
||||
$counts.total++
|
||||
if ($line -cmatch '\[(complete|in_progress|pending)\]') {
|
||||
$phase.Inline = $Matches[1]
|
||||
}
|
||||
continue
|
||||
}
|
||||
if ($line -match '^ {0,3}#{1,3}(?:[ \t]+|$)') {
|
||||
Add-PhaseStatus $counts $phase
|
||||
$phase = $null
|
||||
continue
|
||||
}
|
||||
if ($null -ne $phase -and -not $phase.Primary -and
|
||||
$line -cmatch ('^ {0,3}(?:-[ \t]+)?\*\*' + $statusLabel + '\*\*[ \t]+(complete|in_progress|pending)(?:[ \t]|$)')) {
|
||||
$phase.Primary = $Matches[1]
|
||||
}
|
||||
}
|
||||
Add-PhaseStatus $counts $phase
|
||||
return "$($counts.complete)/$($counts.total) complete, $($counts.in_progress) in_progress, $($counts.pending) pending"
|
||||
}
|
||||
|
||||
function Show-PlanList {
|
||||
if (-not (Test-Path -LiteralPath $PlanRoot -PathType Container)) {
|
||||
Write-Output "No planning directory found."
|
||||
return
|
||||
}
|
||||
if (-not (Test-WithinRoot $PlanRoot)) {
|
||||
Write-Error "Error: planning directory is outside the project or cannot be verified."
|
||||
exit 1
|
||||
}
|
||||
$active = Get-CurrentActivePlan
|
||||
Write-Output "Available plans:"
|
||||
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)) {
|
||||
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 }
|
||||
try { $status = Get-PhaseStatus $planFile } catch { continue }
|
||||
$marker = ""
|
||||
if ($plan.Name -ceq $active) { $marker = " [active]" }
|
||||
Write-Output "- $($plan.Name)$marker - $status"
|
||||
$found = $true
|
||||
}
|
||||
if (-not $found) { Write-Output "No named plans found." }
|
||||
}
|
||||
|
||||
if ($Help -or $PlanId -eq "--help" -or $PlanId -eq "-h") {
|
||||
Write-Output "Usage: set-active-plan.ps1 [-List|-l|--list|PLAN_ID]"
|
||||
exit 0
|
||||
}
|
||||
|
||||
if ($List -or $PlanId -eq "--list" -or $PlanId -eq "-l") {
|
||||
if ($List -and $PlanId) {
|
||||
Write-Error "Error: list plans or set PLAN_ID in separate calls."
|
||||
exit 1
|
||||
}
|
||||
Show-PlanList
|
||||
exit 0
|
||||
}
|
||||
|
||||
if ($PlanId -eq "") {
|
||||
$current = ""
|
||||
if ((Test-Path -LiteralPath $PlanRoot -PathType Container) -and -not (Test-WithinRoot $PlanRoot)) {
|
||||
Write-Error "Error: planning directory is outside the project or cannot be verified."
|
||||
exit 1
|
||||
}
|
||||
if (Test-WithinRoot $PlanRoot) { $current = Get-CurrentActivePlan }
|
||||
if ($current) {
|
||||
$planDir = Join-Path $PlanRoot $current
|
||||
if ((Test-Path -LiteralPath $planDir -PathType Container) -and (Test-WithinRoot $planDir)) {
|
||||
Write-Output "Active plan: $current"
|
||||
Write-Output "Path: $planDir"
|
||||
} else {
|
||||
Write-Output "Active plan pointer: $current (directory not found or outside project - stale pointer)"
|
||||
}
|
||||
} else {
|
||||
Write-Output "No active plan set."
|
||||
}
|
||||
exit 0
|
||||
}
|
||||
|
||||
if (-not (Test-ValidSlug $PlanId)) {
|
||||
Write-Error "Error: invalid plan ID. Use letters, numbers, underscores, dots, or hyphens; start with a letter, number, or underscore."
|
||||
exit 1
|
||||
}
|
||||
$PlanDir = Join-Path $PlanRoot $PlanId
|
||||
if (-not (Test-Path -LiteralPath $PlanDir -PathType Container)) {
|
||||
Write-Error "Error: plan directory not found: $PlanDir"
|
||||
Write-Error "Run: init-session.sh `"$PlanId`" to create it, or check .planning\ for available plans."
|
||||
exit 1
|
||||
}
|
||||
if (-not (Test-WithinRoot $PlanRoot) -or -not (Test-WithinRoot $PlanDir)) {
|
||||
Write-Error "Error: plan directory must remain within the project."
|
||||
exit 1
|
||||
}
|
||||
$activeItem = Get-Item -LiteralPath $ActiveFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not (Test-SafeActiveFile)) {
|
||||
Write-Error "Error: the active plan pointer must be a regular file within the project."
|
||||
exit 1
|
||||
}
|
||||
|
||||
$utf8NoBom = New-Object System.Text.UTF8Encoding($false)
|
||||
# Replace the directory entry instead of truncating an existing inode: a
|
||||
# hardlinked pointer must not overwrite another file. The exclusive temporary
|
||||
# file lives beside the pointer, keeping replacement on the same filesystem.
|
||||
$tempFile = Join-Path $PlanRoot ('.active_plan.' + [guid]::NewGuid().ToString('N') + '.tmp')
|
||||
$createdTemp = $false
|
||||
try {
|
||||
$stream = [IO.File]::Open($tempFile, [IO.FileMode]::CreateNew, [IO.FileAccess]::Write, [IO.FileShare]::None)
|
||||
$createdTemp = $true
|
||||
try {
|
||||
$bytes = $utf8NoBom.GetBytes($PlanId)
|
||||
$stream.Write($bytes, 0, $bytes.Length)
|
||||
$stream.Flush()
|
||||
} finally { $stream.Dispose() }
|
||||
if ($activeItem) {
|
||||
[IO.File]::Replace($tempFile, $ActiveFile, [NullString]::Value)
|
||||
} else {
|
||||
[IO.File]::Move($tempFile, $ActiveFile)
|
||||
}
|
||||
} catch {
|
||||
Write-Error "Error: could not set the active plan pointer: $($_.Exception.Message)"
|
||||
exit 1
|
||||
} finally {
|
||||
if ($createdTemp -and (Test-Path -LiteralPath $tempFile)) {
|
||||
Remove-Item -LiteralPath $tempFile -Force -ErrorAction SilentlyContinue
|
||||
}
|
||||
}
|
||||
Write-Output "Active plan set to: $PlanId"
|
||||
Write-Output "Path: $PlanDir"
|
||||
Write-Output ""
|
||||
Write-Output "To pin this terminal session only:"
|
||||
Write-Output "`$env:PLAN_ID = '$PlanId'"
|
||||
@@ -0,0 +1,335 @@
|
||||
#!/bin/sh
|
||||
# List saved named plans, show the shared pointer, or change that pointer.
|
||||
# Usage: set-active-plan.sh [--list|-l|PLAN_ID]
|
||||
# Operates on the current project; listing never binds a host or injects data.
|
||||
set -eu
|
||||
PLAN_ROOT="${PWD}/.planning"
|
||||
ACTIVE_FILE="${PLAN_ROOT}/.active_plan"
|
||||
PWF_ROOT_PIN=""
|
||||
|
||||
# Use the resolver canonicalization policy without running plan selection.
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Pure-sh backslash-to-forward-slash normalizer; result lands in $NORM_OUT.
|
||||
# Windows-native coreutils builds (e.g. C:\Program Files\coreutils on PATH
|
||||
# ahead of Git's usr/bin) canonicalize MSYS-style /c/... input to C:\-style
|
||||
# backslash output. The containment prefix match below is written with forward
|
||||
# slashes, so without this normalization every canonical pair mismatches and
|
||||
# resolution silently fails. On POSIX systems paths contain no backslash and
|
||||
# this is the identity. A literal backslash in a Unix filename normalizes to
|
||||
# "/" and at worst fails containment — the safe direction. No subshell, no
|
||||
# fork: plain parameter expansion in a loop.
|
||||
norm_slashes() {
|
||||
NORM_OUT=""
|
||||
_ns_rest="$1"
|
||||
while :; do
|
||||
case "${_ns_rest}" in
|
||||
*\\*)
|
||||
NORM_OUT="${NORM_OUT}${_ns_rest%%\\*}/"
|
||||
_ns_rest="${_ns_rest#*\\}"
|
||||
;;
|
||||
*)
|
||||
NORM_OUT="${NORM_OUT}${_ns_rest}"
|
||||
break
|
||||
;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
out="$(realpath "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v readlink >/dev/null 2>&1; then
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -I -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment guard (security A1.3): a resolved plan dir must canonicalize to a
|
||||
# path under the project root (the CWD the script runs from). A symlink inside
|
||||
# a valid slug dir pointing at /etc or outside the workspace would otherwise let
|
||||
# the hooks hash and inject an arbitrary file. On any violation we return 1 so
|
||||
# the caller treats the candidate as unresolved and falls back safely.
|
||||
#
|
||||
# The root canonicalizes via the relative token "." rather than the $PWD
|
||||
# string. On some Windows/MSYS setups (8.3 short names, the /tmp mount alias)
|
||||
# realpath("$PWD") and realpath(relative-candidate) resolve through different
|
||||
# code paths and land on differently-spelled-but-equal targets, so the prefix
|
||||
# match below fails and resolution silently goes dark. "." resolves through
|
||||
# the same physical-cwd path candidates already use (same fix inject-plan.sh
|
||||
# received earlier; the resolver kept the $PWD form until now). Both sides are
|
||||
# backslash-normalized before comparison for Windows-native canonicalizers.
|
||||
# The root is computed once per run: the newest-mtime scan calls this guard
|
||||
# per plan dir, and each canonicalize costs a process spawn on Windows.
|
||||
#
|
||||
# With a PWF_PLAN_ROOT pin (issue #212) containment is checked against THAT
|
||||
# root instead of the cwd: candidates arrive ${PWF_PLAN_ROOT}/-prefixed, so
|
||||
# both sides canonicalize through the same path spelling. Unpinned keeps the
|
||||
# relative "." root — byte-identical to the legacy check.
|
||||
ROOT_REAL=""
|
||||
ROOT_REAL_SET=0
|
||||
is_within_root() {
|
||||
candidate="$1"
|
||||
if [ "${ROOT_REAL_SET}" = "0" ]; then
|
||||
ROOT_REAL="$(canonicalize "${PWF_ROOT_PIN:-.}")" || ROOT_REAL=""
|
||||
norm_slashes "${ROOT_REAL}"
|
||||
ROOT_REAL="${NORM_OUT}"
|
||||
ROOT_REAL_SET=1
|
||||
fi
|
||||
# Canonicalize the candidate through its cwd-RELATIVE form whenever it
|
||||
# lives under ${PWD}. The candidate string is built from ${PWD} (an MSYS
|
||||
# long-form spelling), while the root canonicalizes from "." (the process
|
||||
# cwd, which a caller may have set with an 8.3 short-form string). A
|
||||
# Windows-native realpath does not unify those spellings, so canonicalizing
|
||||
# both sides from the same cwd base is the only spelling-stable comparison.
|
||||
# The emitted result keeps the original absolute candidate — only the
|
||||
# containment check uses the relative form.
|
||||
# Pinned resolution skips the rewrite: candidate and root then share the
|
||||
# ${PWF_PLAN_ROOT} spelling, so both canonicalize directly from it.
|
||||
if [ -n "${PWF_ROOT_PIN}" ]; then
|
||||
check_target="${candidate}"
|
||||
else
|
||||
case "${candidate}" in
|
||||
"${PWD}"/*) check_target=".${candidate#"${PWD}"}" ;;
|
||||
*) check_target="${candidate}" ;;
|
||||
esac
|
||||
fi
|
||||
cand_real="$(canonicalize "${check_target}")" || cand_real=""
|
||||
norm_slashes "${cand_real}"
|
||||
cand_real="${NORM_OUT}"
|
||||
if [ -z "${ROOT_REAL}" ] || [ -z "${cand_real}" ]; then
|
||||
# Slug validation blocks textual traversal, but only successful
|
||||
# canonicalization can rule out a symlink/junction escape.
|
||||
return 1
|
||||
fi
|
||||
case "${cand_real}" in
|
||||
"${ROOT_REAL}"|"${ROOT_REAL}"/*) return 0 ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Each phase contributes at most one status. An explicit Status line wins
|
||||
# over an inline heading marker. Fenced examples and unrelated sections are
|
||||
# not phases. Keep this parser aligned with the PowerShell helper.
|
||||
phase_status() {
|
||||
awk '
|
||||
function finish() {
|
||||
if (phase) {
|
||||
status = primary != "" ? primary : inline_status
|
||||
if (status == "complete") complete++
|
||||
else if (status == "in_progress") in_progress++
|
||||
else if (status == "pending") pending++
|
||||
}
|
||||
phase = 0; primary = ""; inline_status = ""
|
||||
}
|
||||
{
|
||||
line = $0
|
||||
sub(/\r$/, "", line)
|
||||
trimmed = line
|
||||
sub(/^ */, "", trimmed)
|
||||
if (line ~ /^ ? ? ?```/ || line ~ /^ ? ? ?~~~/) {
|
||||
marker = substr(trimmed, 1, 1)
|
||||
run = 0
|
||||
while (substr(trimmed, run + 1, 1) == marker) run++
|
||||
if (fence == "") { fence = marker; fence_length = run }
|
||||
else if (marker == fence && run >= fence_length && substr(trimmed, run + 1) ~ /^[ \t]*$/) fence = ""
|
||||
next
|
||||
}
|
||||
if (fence != "") next
|
||||
if (line ~ /^ ? ? ?###[ \t]+(Phase|Fase|المرحلة|阶段|階段)[ \t]+[0-9]+([^0-9A-Za-z_]|$)/) {
|
||||
finish(); phase = 1; total++
|
||||
if (match(line, /\[(complete|in_progress|pending)\]/))
|
||||
inline_status = substr(line, RSTART + 1, RLENGTH - 2)
|
||||
} else if (line ~ /^ ? ? ?(###|##|#)([ \t]|$)/) {
|
||||
finish()
|
||||
} else if (phase && primary == "" && line ~ /^ ? ? ?(-[ \t]+)?\*\*(Status:|Estado:|الحالة:|状态:|狀態:)\*\*[ \t]+(complete|in_progress|pending)([ \t]|$)/) {
|
||||
sub(/^ ? ? ?(-[ \t]+)?\*\*(Status:|Estado:|الحالة:|状态:|狀態:)\*\*[ \t]+/, "", line)
|
||||
sub(/[ \t].*$/, "", line)
|
||||
primary = line
|
||||
}
|
||||
}
|
||||
END {
|
||||
finish()
|
||||
printf "%d/%d complete, %d in_progress, %d pending", complete, total, in_progress, pending
|
||||
}
|
||||
' < "$1"
|
||||
}
|
||||
|
||||
current_active() {
|
||||
if [ -f "${ACTIVE_FILE}" ] && is_within_root "${ACTIVE_FILE}"; then
|
||||
_current="$(tr '\r' '\n' < "${ACTIVE_FILE}")"
|
||||
# Windows editors and older PowerShell defaults can leave a UTF-8 BOM.
|
||||
# Treat it as an encoding marker, not part of the shared plan slug.
|
||||
_utf8_bom="$(printf '\357\273\277')"
|
||||
case "${_current}" in
|
||||
"${_utf8_bom}"*) _current="${_current#"${_utf8_bom}"}" ;;
|
||||
esac
|
||||
slug_is_valid "${_current}" && printf '%s\n' "${_current}"
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
list_plans() {
|
||||
if [ ! -d "${PLAN_ROOT}" ]; then
|
||||
printf '%s\n' 'No planning directory found.'
|
||||
return 0
|
||||
fi
|
||||
if ! is_within_root "${PLAN_ROOT}"; then
|
||||
printf '%s\n' 'Error: planning directory is outside the project or cannot be verified.' >&2
|
||||
return 1
|
||||
fi
|
||||
_active="$(current_active)"
|
||||
_found=0
|
||||
printf '%s\n' 'Available plans:'
|
||||
for _dir in "${PLAN_ROOT}"/*; do
|
||||
[ -d "${_dir}" ] || continue
|
||||
_id="${_dir##*/}"
|
||||
slug_is_valid "${_id}" || continue
|
||||
is_within_root "${_dir}" || continue
|
||||
_plan_file="${_dir}/task_plan.md"
|
||||
[ -f "${_plan_file}" ] && [ -r "${_plan_file}" ] || continue
|
||||
is_within_root "${_plan_file}" || continue
|
||||
_status="$(phase_status "${_plan_file}")" || continue
|
||||
_marker=''
|
||||
if [ "${_id}" = "${_active}" ]; then _marker=' [active]'; fi
|
||||
printf '%s\n' "- ${_id}${_marker} - ${_status}"
|
||||
_found=1
|
||||
done
|
||||
if [ "${_found}" -eq 0 ]; then
|
||||
printf '%s\n' 'No named plans found.'
|
||||
else
|
||||
printf '%s\n' '[active] marks the shared default pointer. Set PLAN_ID to pin a session.'
|
||||
fi
|
||||
}
|
||||
|
||||
if [ "$#" -gt 1 ]; then
|
||||
printf '%s\n' 'Error: list plans or set PLAN_ID in separate calls.' >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
case "${1:-}" in
|
||||
--list|-l) list_plans; exit $? ;;
|
||||
--help|-h)
|
||||
printf '%s\n' 'Usage: set-active-plan.sh [--list|PLAN_ID]' \
|
||||
'Lists saved named plans in the current project without selecting a plan.'
|
||||
exit 0 ;;
|
||||
esac
|
||||
|
||||
if [ "${1:-}" = '' ]; then
|
||||
if [ -d "${PLAN_ROOT}" ] && ! is_within_root "${PLAN_ROOT}"; then
|
||||
printf '%s\n' 'Error: planning directory is outside the project or cannot be verified.' >&2
|
||||
exit 1
|
||||
fi
|
||||
plan_id="$(current_active)"
|
||||
if [ -n "${plan_id}" ] && [ -d "${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)"
|
||||
else
|
||||
printf '%s\n' 'No active plan set.'
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
|
||||
PLAN_ID="$1"
|
||||
if ! slug_is_valid "${PLAN_ID}"; then
|
||||
printf '%s\n' 'Error: invalid plan ID. Use a named directory under .planning.' >&2
|
||||
exit 1
|
||||
fi
|
||||
PLAN_DIR="${PLAN_ROOT}/${PLAN_ID}"
|
||||
if [ ! -d "${PLAN_DIR}" ]; then
|
||||
printf '%s\n' "Error: plan directory not found: ${PLAN_DIR}" \
|
||||
"Run: init-session.sh \"${PLAN_ID}\" to create it, or use --list to see available plans." >&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
|
||||
fi
|
||||
# A pre-existing pointer must itself be a contained regular file before writing.
|
||||
if { [ -e "${ACTIVE_FILE}" ] || [ -L "${ACTIVE_FILE}" ]; } &&
|
||||
{ [ -L "${ACTIVE_FILE}" ] || [ ! -f "${ACTIVE_FILE}" ] || ! is_within_root "${ACTIVE_FILE}"; }; then
|
||||
printf '%s\n' 'Error: active plan pointer is not a safe file inside the project.' >&2
|
||||
exit 1
|
||||
fi
|
||||
# Replace the pointer atomically instead of truncating a possible hardlink.
|
||||
# mktemp creates a private, exclusive file beside the destination.
|
||||
temp_file="$(mktemp "${PLAN_ROOT}/.active_plan.XXXXXX")" || {
|
||||
printf '%s\n' 'Error: could not create the active plan pointer.' >&2
|
||||
exit 1
|
||||
}
|
||||
trap 'rm -f "${temp_file}"' EXIT
|
||||
trap 'exit 1' HUP INT TERM
|
||||
printf '%s\n' "${PLAN_ID}" > "${temp_file}"
|
||||
if ! mv -f "${temp_file}" "${ACTIVE_FILE}"; then
|
||||
printf '%s\n' 'Error: could not replace the active plan pointer.' >&2
|
||||
exit 1
|
||||
fi
|
||||
trap - EXIT HUP INT TERM
|
||||
printf '%s\n' "Active plan set to: ${PLAN_ID}" "Path: ${PLAN_DIR}" '' \
|
||||
'To pin this terminal session only:' " export PLAN_ID=${PLAN_ID}"
|
||||
@@ -187,6 +187,8 @@ AFTER 3 FAILURES: Escalate to User
|
||||
|
||||
## Scripts
|
||||
|
||||
Kiro keeps its plan in `.kiro/plan/`. The canonical `set-active-plan` listing helper reads named plans under `.planning/` and does not list or switch this Kiro plan.
|
||||
|
||||
Helper scripts (under `assets/scripts/`):
|
||||
|
||||
- `assets/scripts/bootstrap.sh` — Idempotent workspace bootstrap. Creates `.kiro/plan/` and `.kiro/steering/planning-context.md`.
|
||||
|
||||
@@ -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.17.0"
|
||||
version: "3.18.2"
|
||||
|
||||
---
|
||||
|
||||
@@ -46,7 +46,7 @@ Work like Manus: Use persistent markdown files as your "working memory on disk."
|
||||
|
||||
## FIRST: Restore Project State
|
||||
|
||||
**Before continuing**, resolve the plan this task owns. Use the installed `scripts/resolve-plan-dir.sh` (or `.ps1`) with the host's `PLAN_ID` and `PWF_PLAN_ROOT`, then read `task_plan.md`, `progress.md`, and `findings.md` from that selected directory. If an explicit selector is rejected, or session isolation is armed with multiple plans and no `PLAN_ID`, correct the pin and do not fall back to another task. Run `git diff --stat` for code changes not yet recorded there. All planning filenames below mean that selected directory. For parallel tasks, pin each host before it starts or use separate worktrees; a child process export does not change its host. One orchestrator owns a shared plan and summaries, while workers use assigned files or ledgers.
|
||||
**Before continuing**, resolve the plan this task owns. Use the installed `scripts/resolve-plan-dir.sh` (or `.ps1`) with the host's `PLAN_ID` and `PWF_PLAN_ROOT`, then read `task_plan.md`, `progress.md`, and `findings.md` from that selected directory. If an explicit selector is rejected, or multiple named plans exist without `PLAN_ID`, correct the pin and do not fall back to another task. Run `git diff --stat` for code changes not yet recorded there. All planning filenames below mean that selected directory. For parallel tasks, pin each host before it starts or use separate worktrees; a child process export does not change its host. One orchestrator owns a shared plan and summaries, while workers use assigned files or ledgers.
|
||||
|
||||
```bash
|
||||
# Linux/macOS
|
||||
@@ -212,6 +212,12 @@ Helper scripts for automation:
|
||||
- `scripts/check-complete.sh` — Verify all phases complete
|
||||
- `scripts/session-catchup.py`: Explicit same-project session-record aggregation or bounded replay (`--metadata` / `--replay`); bare invocation does not access host history
|
||||
|
||||
### List saved plans
|
||||
|
||||
To find a task before resuming it, run `sh "<skill-dir>/scripts/set-active-plan.sh" --list` or, in Windows PowerShell, `& "<skill-dir>/scripts/set-active-plan.ps1" -List`. Replace `<skill-dir>` with this installed skill directory and keep your current directory at the project root.
|
||||
|
||||
This read-only command lists named plans and phase progress under the current directory's `.planning/`. `[active]` marks the shared default pointer; it does not bind a session. Concurrent tasks still require each host's `PLAN_ID` or separate worktrees.
|
||||
|
||||
## Advanced Topics
|
||||
|
||||
- **Manus Principles:** See [references/reference.md](references/reference.md)
|
||||
|
||||
@@ -59,12 +59,9 @@ Windows runs the shell chain through Git Bash and nothing else:
|
||||
one turn-marker slot and one progress-guard slot per plan.
|
||||
|
||||
Known, accepted differences from the shell reference:
|
||||
* Two plan directories with the same whole-second mtime, no .active_plan
|
||||
and no PLAN_ID: the reference picks the first in the shell's glob order
|
||||
(locale collation), this twin the first in code-point order. The same
|
||||
collation difference can change which three of four or more nested
|
||||
projects the ambiguity notice names. A machine runs one implementation,
|
||||
so neither choice flips within a session.
|
||||
* Shell glob order follows locale collation; this twin uses code-point
|
||||
order. This can change which three of four or more nested projects the
|
||||
ambiguity notice names.
|
||||
* BSD sed (macOS) appends a newline to a progress.md whose last line has
|
||||
none; GNU sed and this twin do not.
|
||||
* With PWF_PLAN_ROOT set under Git Bash the shell sees the pin as typed
|
||||
@@ -837,6 +834,16 @@ class Injector(object):
|
||||
scope = ""
|
||||
explicit = bool(plan_prefix)
|
||||
plan_id = env.get("PLAN_ID", "")
|
||||
ambiguous = plan_is_ambiguous(
|
||||
plan_prefix + ".planning", plan_root_pin if plan_root_pin else ".", plan_id
|
||||
)
|
||||
if ambiguous and (context == "preflight" or not is_dir(plan_prefix + ".planning/sessions")):
|
||||
if context == "userprompt":
|
||||
self.echo(
|
||||
"[planning-with-files] Multiple plans are available. Set PLAN_ID=<slug> "
|
||||
"for this session; nothing injected."
|
||||
)
|
||||
raise Bail()
|
||||
if plan_id:
|
||||
if slug_is_valid(plan_id) and is_dir(plan_prefix + ".planning/" + plan_id):
|
||||
resolved = plan_prefix + ".planning/" + plan_id
|
||||
@@ -923,30 +930,14 @@ class Injector(object):
|
||||
"single-session mode."
|
||||
)
|
||||
raise Bail()
|
||||
if not plan_id:
|
||||
plan_n = 1 if is_file(plan_prefix + "task_plan.md") else 0
|
||||
try:
|
||||
names = sorted(os.listdir(plan_prefix + ".planning"))
|
||||
except OSError:
|
||||
names = []
|
||||
for name in names:
|
||||
if name.startswith("."):
|
||||
continue
|
||||
if not is_file(plan_prefix + ".planning/" + name + "/task_plan.md"):
|
||||
continue
|
||||
if not slug_is_valid(name):
|
||||
continue
|
||||
plan_n += 1
|
||||
if plan_n > 1:
|
||||
break
|
||||
if plan_n > 1:
|
||||
if context == "userprompt":
|
||||
self.echo(
|
||||
"[planning-with-files] Multiple plans are available while session "
|
||||
"isolation is armed. Set PLAN_ID=<slug> for this session; nothing "
|
||||
"injected."
|
||||
)
|
||||
raise Bail()
|
||||
if ambiguous:
|
||||
if context == "userprompt":
|
||||
self.echo(
|
||||
"[planning-with-files] Multiple plans are available while session "
|
||||
"isolation is armed. Set PLAN_ID=<slug> for this session; nothing "
|
||||
"injected."
|
||||
)
|
||||
raise Bail()
|
||||
|
||||
if not explicit:
|
||||
nested = []
|
||||
@@ -1326,6 +1317,23 @@ def inject(context, env=None):
|
||||
# Twin of resolve-plan-dir.sh (the shared resolver the dispatcher uses).
|
||||
# --------------------------------------------------------------------------
|
||||
|
||||
def plan_is_ambiguous(plan_root, project_root, plan_id=""):
|
||||
"""A project pointer or mtime cannot bind a session to multiple plans."""
|
||||
if plan_id:
|
||||
return False
|
||||
count = 1 if is_dir(plan_root + "/sessions") and is_file(project_root + "/task_plan.md") else 0
|
||||
try:
|
||||
names = os.listdir(plan_root)
|
||||
except OSError:
|
||||
names = []
|
||||
for name in names:
|
||||
if slug_is_valid(name) and is_file(plan_root + "/" + name + "/task_plan.md"):
|
||||
count += 1
|
||||
if count > 1:
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
def resolve_plan_dir(env=None):
|
||||
"""Return (spelled, filesystem) paths of the plan directory, or ("", "").
|
||||
|
||||
@@ -1360,6 +1368,9 @@ def resolve_plan_dir(env=None):
|
||||
return found(plan_id)
|
||||
return ("", "")
|
||||
|
||||
if plan_is_ambiguous(fs_root, pin if pin else "."):
|
||||
return ("", "")
|
||||
|
||||
active_file = fs_root + "/.active_plan"
|
||||
if is_file(active_file):
|
||||
try:
|
||||
@@ -1441,6 +1452,8 @@ class ClaudeDispatcher(object):
|
||||
return (spelled, fs)
|
||||
if self.env.get("PLAN_ID", "") or self.env.get("PWF_PLAN_ROOT", ""):
|
||||
return ("", "")
|
||||
if plan_is_ambiguous(".planning", "."):
|
||||
return ("", "")
|
||||
if is_file("task_plan.md"):
|
||||
return (".", ".")
|
||||
return ("", "")
|
||||
|
||||
@@ -254,6 +254,29 @@ is_within_root() {
|
||||
# The .active_plan pointer, the newest-by-mtime fallback, and the legacy root
|
||||
# task_plan.md are cwd GUESSES — only guesses are subject to the nested-root
|
||||
# conflict check below.
|
||||
# Shared .active_plan and directory mtime cannot identify this session's plan.
|
||||
# Check before selection or preflight, even when isolation was never armed.
|
||||
PLAN_AMBIGUOUS=0
|
||||
if [ -z "${PLAN_ID:-}" ]; then
|
||||
PLAN_COUNT=0
|
||||
if [ -d "${PLAN_PREFIX}.planning/sessions" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; 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}"
|
||||
slug_is_valid "${plan_candidate_dir##*/}" || continue
|
||||
PLAN_COUNT=$((PLAN_COUNT + 1))
|
||||
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
|
||||
done
|
||||
fi
|
||||
if [ "$PLAN_AMBIGUOUS" = "1" ] && { [ "$CONTEXT" = "preflight" ] || [ ! -d "${PLAN_PREFIX}.planning/sessions" ]; }; then
|
||||
if [ "$CONTEXT" = "userprompt" ]; then
|
||||
echo "[planning-with-files] Multiple plans are available. Set PLAN_ID=<slug> for this session; nothing injected."
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
|
||||
RESOLVED=""
|
||||
SCOPE=""
|
||||
EXPLICIT=0
|
||||
@@ -442,27 +465,13 @@ PY
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# An attachment admits a session but does not select one of several plans.
|
||||
# When isolation is armed, require PLAN_ID if more than one live same-root
|
||||
# candidate exists. PWF_PLAN_ROOT selects the project root, not a plan
|
||||
# within that root.
|
||||
if [ -z "${PLAN_ID:-}" ]; then
|
||||
SESSION_PLAN_N=0
|
||||
[ -f "${PLAN_PREFIX}task_plan.md" ] && SESSION_PLAN_N=1
|
||||
for candidate in "${PLAN_PREFIX}".planning/*/task_plan.md; do
|
||||
[ -f "$candidate" ] || continue
|
||||
candidate_dir="${candidate%/task_plan.md}"
|
||||
candidate_slug="${candidate_dir##*/}"
|
||||
slug_is_valid "$candidate_slug" || continue
|
||||
SESSION_PLAN_N=$((SESSION_PLAN_N + 1))
|
||||
[ "$SESSION_PLAN_N" -gt 1 ] && break
|
||||
done
|
||||
if [ "$SESSION_PLAN_N" -gt 1 ]; then
|
||||
if [ "$CONTEXT" = "userprompt" ]; then
|
||||
echo "[planning-with-files] Multiple plans are available while session isolation is armed. Set PLAN_ID=<slug> for this session; nothing injected."
|
||||
fi
|
||||
exit 0
|
||||
# Attachment admits a session but does not select its plan. Preserve the
|
||||
# attachment-first notice above for sessions that never opted in.
|
||||
if [ "$PLAN_AMBIGUOUS" = "1" ]; then
|
||||
if [ "$CONTEXT" = "userprompt" ]; then
|
||||
echo "[planning-with-files] Multiple plans are available while session isolation is armed. Set PLAN_ID=<slug> for this session; nothing injected."
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@@ -15,6 +15,13 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Optional probe distinguishes ambiguity from the empty legacy-root result.
|
||||
# Both modes keep stdout data-only and always exit zero.
|
||||
CHECK_AMBIGUITY=0
|
||||
if [ "${1:-}" = "--check-ambiguity" ]; then
|
||||
CHECK_AMBIGUITY=1
|
||||
shift
|
||||
fi
|
||||
PLAN_ROOT="${1:-${PWD}/.planning}"
|
||||
|
||||
# --- PWF_PLAN_ROOT: absolute plan-root binding (issue #212). ---
|
||||
@@ -321,6 +328,29 @@ resolve_latest_dir() {
|
||||
# the fail-closed signal on this channel, exactly as the PWF_PLAN_ROOT guard
|
||||
# above already does it; a non-zero status would kill callers running under
|
||||
# set -e for a condition that is not an internal error.
|
||||
# A shared pointer or mtime is not a per-session binding (issue #240).
|
||||
# Count conservatively, just like injection: slug-valid live plan files.
|
||||
# The legacy root joins the count only when session isolation is armed.
|
||||
PLAN_AMBIGUOUS=0
|
||||
if [ -z "${PLAN_ID:-}" ]; then
|
||||
PLAN_COUNT=0
|
||||
if [ -d "${PLAN_ROOT}/sessions" ] && [ -f "${PWF_ROOT_PIN:-.}/task_plan.md" ]; 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}"
|
||||
slug_is_valid "${plan_candidate_dir##*/}" || continue
|
||||
PLAN_COUNT=$((PLAN_COUNT + 1))
|
||||
if [ "$PLAN_COUNT" -gt 1 ]; then PLAN_AMBIGUOUS=1; break; fi
|
||||
done
|
||||
fi
|
||||
if [ "$CHECK_AMBIGUITY" = "1" ]; then
|
||||
[ "$PLAN_AMBIGUOUS" = "1" ] && printf '%s\n' 'PWF_PLAN_AMBIGUOUS_V1'
|
||||
exit 0
|
||||
fi
|
||||
[ "$PLAN_AMBIGUOUS" = "1" ] && exit 0
|
||||
|
||||
if [ -n "${PLAN_ID:-}" ]; then
|
||||
resolve_from_env && exit 0
|
||||
exit 0
|
||||
|
||||
@@ -0,0 +1,301 @@
|
||||
# planning-with-files: set, display, or list the active plan pointer (PowerShell).
|
||||
#
|
||||
# Usage:
|
||||
# .\set-active-plan.ps1 <plan_id> - pin .planning\.active_plan to plan_id
|
||||
# .\set-active-plan.ps1 - print the current active plan (if any)
|
||||
# .\set-active-plan.ps1 -List - list available named plans and phase counts
|
||||
# .\set-active-plan.ps1 --list - equivalent to -List and -l
|
||||
|
||||
param(
|
||||
[Parameter(Position = 0)]
|
||||
[string]$PlanId = "",
|
||||
[Alias('l', '-list')]
|
||||
[switch]$List,
|
||||
[Alias('h', '-help')]
|
||||
[switch]$Help
|
||||
)
|
||||
|
||||
$ProjectRoot = (Get-Location).Path
|
||||
# Windows PowerShell 5.1 can silently change directories when -File inherits
|
||||
# a cwd containing wildcard characters. Recover that physical cwd only for a
|
||||
# direct invocation of this script; interactive Set-Location remains primary.
|
||||
if ($PSVersionTable.PSVersion.Major -eq 5 -and
|
||||
[System.Management.Automation.WildcardPattern]::ContainsWildcardCharacters([Environment]::CurrentDirectory)) {
|
||||
$processArgs = [Environment]::GetCommandLineArgs()
|
||||
for ($index = 0; $index -lt ($processArgs.Length - 1); $index++) {
|
||||
if ($processArgs[$index] -ieq '-File') {
|
||||
$entryScript = $processArgs[$index + 1]
|
||||
if (-not [IO.Path]::IsPathRooted($entryScript)) {
|
||||
$entryScript = Join-Path ([Environment]::CurrentDirectory) $entryScript
|
||||
}
|
||||
if ([IO.Path]::GetFullPath($entryScript) -eq [IO.Path]::GetFullPath($PSCommandPath)) {
|
||||
$ProjectRoot = [Environment]::CurrentDirectory
|
||||
}
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
$PlanRoot = Join-Path $ProjectRoot ".planning"
|
||||
$ActiveFile = Join-Path $PlanRoot ".active_plan"
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
|
||||
# Resolve-Path can retain a junction's spelling. Like resolve-plan-dir.ps1,
|
||||
# open the actual filesystem object before checking the project boundary.
|
||||
# The Windows handle supports both directories and task_plan.md files.
|
||||
function Get-FinalPath {
|
||||
param([string]$Path)
|
||||
if (-not ("PwfPlanListingNative" -as [type])) {
|
||||
Add-Type -ErrorAction Stop -TypeDefinition @'
|
||||
using System;
|
||||
using System.ComponentModel;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
using Microsoft.Win32.SafeHandles;
|
||||
|
||||
public static class PwfPlanListingNative {
|
||||
[DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
|
||||
private static extern SafeFileHandle CreateFileW(
|
||||
string name, uint access, uint share, IntPtr security,
|
||||
uint creation, uint flags, IntPtr template);
|
||||
[DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
|
||||
private static extern uint GetFinalPathNameByHandleW(
|
||||
SafeFileHandle handle, StringBuilder path, uint length, uint flags);
|
||||
[DllImport("libc", SetLastError = true)]
|
||||
private static extern IntPtr realpath(string path, IntPtr resolved);
|
||||
[DllImport("libc")]
|
||||
private static extern void free(IntPtr pointer);
|
||||
|
||||
public static string FinalPath(string path) {
|
||||
if (Environment.OSVersion.Platform != PlatformID.Win32NT) {
|
||||
IntPtr resolved = realpath(path, IntPtr.Zero);
|
||||
if (resolved == IntPtr.Zero) throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
try { return Marshal.PtrToStringAnsi(resolved); }
|
||||
finally { free(resolved); }
|
||||
}
|
||||
// OPEN_EXISTING, FILE_SHARE_READ | WRITE | DELETE, BACKUP_SEMANTICS.
|
||||
using (SafeFileHandle handle = CreateFileW(
|
||||
path, 0, 7, IntPtr.Zero, 3, 0x02000000, IntPtr.Zero)) {
|
||||
if (handle.IsInvalid) throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
StringBuilder buffer = new StringBuilder(32768);
|
||||
uint length = GetFinalPathNameByHandleW(handle, buffer, (uint)buffer.Capacity, 0);
|
||||
if (length == 0 || length >= buffer.Capacity)
|
||||
throw new Win32Exception(Marshal.GetLastWin32Error());
|
||||
string result = buffer.ToString();
|
||||
if (result.StartsWith(@"\\?\UNC\", StringComparison.OrdinalIgnoreCase))
|
||||
return @"\\" + result.Substring(8);
|
||||
if (result.StartsWith(@"\\?\", StringComparison.OrdinalIgnoreCase))
|
||||
return result.Substring(4);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
'@
|
||||
}
|
||||
return [PwfPlanListingNative]::FinalPath($Path)
|
||||
}
|
||||
|
||||
function Test-WithinRoot {
|
||||
param([string]$Path)
|
||||
try {
|
||||
$rootReal = (Get-FinalPath $ProjectRoot).TrimEnd('\', '/')
|
||||
$pathReal = (Get-FinalPath $Path).TrimEnd('\', '/')
|
||||
$comparison = [StringComparison]::Ordinal
|
||||
if ($script:IsWindowsHost) { $comparison = [StringComparison]::OrdinalIgnoreCase }
|
||||
return $pathReal.Equals($rootReal, $comparison) -or
|
||||
$pathReal.StartsWith($rootReal + [IO.Path]::DirectorySeparatorChar, $comparison)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
}
|
||||
|
||||
function Test-ValidSlug {
|
||||
param([string]$Name)
|
||||
return $Name -cmatch '^[A-Za-z0-9_][A-Za-z0-9._-]*\z'
|
||||
}
|
||||
|
||||
function Test-SafeActiveFile {
|
||||
param([switch]$AllowLink)
|
||||
$item = Get-Item -LiteralPath $ActiveFile -Force -ErrorAction SilentlyContinue
|
||||
if (-not $item) { return $false }
|
||||
# Reading may follow a verified in-project link; writing must not.
|
||||
return -not $item.PSIsContainer -and
|
||||
($AllowLink -or (($item.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) -and
|
||||
(Test-WithinRoot $ActiveFile)
|
||||
}
|
||||
|
||||
function Get-CurrentActivePlan {
|
||||
if (-not (Test-SafeActiveFile -AllowLink)) { return "" }
|
||||
try {
|
||||
$current = ([string](Get-Content -LiteralPath $ActiveFile -Raw -Encoding UTF8 -ErrorAction Stop)).Trim([char[]]"`r`n")
|
||||
if (Test-ValidSlug $current) { return $current }
|
||||
} catch { }
|
||||
return ""
|
||||
}
|
||||
|
||||
function Add-PhaseStatus {
|
||||
param([hashtable]$Counts, $Phase)
|
||||
if ($null -eq $Phase) { return }
|
||||
$status = $Phase.Inline
|
||||
if ($Phase.Primary) { $status = $Phase.Primary }
|
||||
if ($status) { $Counts[$status]++ }
|
||||
}
|
||||
|
||||
function Get-PhaseStatus {
|
||||
param([string]$PlanFile)
|
||||
$counts = @{ total = 0; complete = 0; in_progress = 0; pending = 0 }
|
||||
$phase = $null
|
||||
$fence = ""
|
||||
$fenceLength = 0
|
||||
# The shipped translations keep status identifiers in English. Unicode
|
||||
# escapes preserve Windows PowerShell 5.1 compatibility without a BOM.
|
||||
$phaseLabel = '(?:Phase|Fase|\u0627\u0644\u0645\u0631\u062d\u0644\u0629|\u9636\u6bb5|\u968e\u6bb5)'
|
||||
$statusLabel = '(?:Status:|Estado:|\u0627\u0644\u062d\u0627\u0644\u0629:|\u72b6\u6001\uff1a|\u72c0\u614b\uff1a)'
|
||||
# Read once; an empty file is a valid plan with zero phases.
|
||||
$content = [string](Get-Content -LiteralPath $PlanFile -Raw -Encoding UTF8 -ErrorAction Stop)
|
||||
foreach ($line in ($content -split '\r?\n')) {
|
||||
if ($fence) {
|
||||
$closing = '^ {0,3}' + [regex]::Escape($fence) + '{' + $fenceLength + ',}[ \t]*$'
|
||||
if ($line -match $closing) { $fence = "" }
|
||||
continue
|
||||
}
|
||||
if ($line -match '^ {0,3}(`{3,}|~{3,})') {
|
||||
$fence = $Matches[1].Substring(0, 1)
|
||||
$fenceLength = $Matches[1].Length
|
||||
continue
|
||||
}
|
||||
if ($line -cmatch ('^ {0,3}###[ \t]+' + $phaseLabel + '[ \t]+[0-9]+(?:[^0-9A-Za-z_]|$)')) {
|
||||
Add-PhaseStatus $counts $phase
|
||||
$phase = @{ Primary = ""; Inline = "" }
|
||||
$counts.total++
|
||||
if ($line -cmatch '\[(complete|in_progress|pending)\]') {
|
||||
$phase.Inline = $Matches[1]
|
||||
}
|
||||
continue
|
||||
}
|
||||
if ($line -match '^ {0,3}#{1,3}(?:[ \t]+|$)') {
|
||||
Add-PhaseStatus $counts $phase
|
||||
$phase = $null
|
||||
continue
|
||||
}
|
||||
if ($null -ne $phase -and -not $phase.Primary -and
|
||||
$line -cmatch ('^ {0,3}(?:-[ \t]+)?\*\*' + $statusLabel + '\*\*[ \t]+(complete|in_progress|pending)(?:[ \t]|$)')) {
|
||||
$phase.Primary = $Matches[1]
|
||||
}
|
||||
}
|
||||
Add-PhaseStatus $counts $phase
|
||||
return "$($counts.complete)/$($counts.total) complete, $($counts.in_progress) in_progress, $($counts.pending) pending"
|
||||
}
|
||||
|
||||
function Show-PlanList {
|
||||
if (-not (Test-Path -LiteralPath $PlanRoot -PathType Container)) {
|
||||
Write-Output "No planning directory found."
|
||||
return
|
||||
}
|
||||
if (-not (Test-WithinRoot $PlanRoot)) {
|
||||
Write-Error "Error: planning directory is outside the project or cannot be verified."
|
||||
exit 1
|
||||
}
|
||||
$active = Get-CurrentActivePlan
|
||||
Write-Output "Available plans:"
|
||||
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)) {
|
||||
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 }
|
||||
try { $status = Get-PhaseStatus $planFile } catch { continue }
|
||||
$marker = ""
|
||||
if ($plan.Name -ceq $active) { $marker = " [active]" }
|
||||
Write-Output "- $($plan.Name)$marker - $status"
|
||||
$found = $true
|
||||
}
|
||||
if (-not $found) { Write-Output "No named plans found." }
|
||||
}
|
||||
|
||||
if ($Help -or $PlanId -eq "--help" -or $PlanId -eq "-h") {
|
||||
Write-Output "Usage: set-active-plan.ps1 [-List|-l|--list|PLAN_ID]"
|
||||
exit 0
|
||||
}
|
||||
|
||||
if ($List -or $PlanId -eq "--list" -or $PlanId -eq "-l") {
|
||||
if ($List -and $PlanId) {
|
||||
Write-Error "Error: list plans or set PLAN_ID in separate calls."
|
||||
exit 1
|
||||
}
|
||||
Show-PlanList
|
||||
exit 0
|
||||
}
|
||||
|
||||
if ($PlanId -eq "") {
|
||||
$current = ""
|
||||
if ((Test-Path -LiteralPath $PlanRoot -PathType Container) -and -not (Test-WithinRoot $PlanRoot)) {
|
||||
Write-Error "Error: planning directory is outside the project or cannot be verified."
|
||||
exit 1
|
||||
}
|
||||
if (Test-WithinRoot $PlanRoot) { $current = Get-CurrentActivePlan }
|
||||
if ($current) {
|
||||
$planDir = Join-Path $PlanRoot $current
|
||||
if ((Test-Path -LiteralPath $planDir -PathType Container) -and (Test-WithinRoot $planDir)) {
|
||||
Write-Output "Active plan: $current"
|
||||
Write-Output "Path: $planDir"
|
||||
} else {
|
||||
Write-Output "Active plan pointer: $current (directory not found or outside project - stale pointer)"
|
||||
}
|
||||
} else {
|
||||
Write-Output "No active plan set."
|
||||
}
|
||||
exit 0
|
||||
}
|
||||
|
||||
if (-not (Test-ValidSlug $PlanId)) {
|
||||
Write-Error "Error: invalid plan ID. Use letters, numbers, underscores, dots, or hyphens; start with a letter, number, or underscore."
|
||||
exit 1
|
||||
}
|
||||
$PlanDir = Join-Path $PlanRoot $PlanId
|
||||
if (-not (Test-Path -LiteralPath $PlanDir -PathType Container)) {
|
||||
Write-Error "Error: plan directory not found: $PlanDir"
|
||||
Write-Error "Run: init-session.sh `"$PlanId`" to create it, or check .planning\ for available plans."
|
||||
exit 1
|
||||
}
|
||||
if (-not (Test-WithinRoot $PlanRoot) -or -not (Test-WithinRoot $PlanDir)) {
|
||||
Write-Error "Error: plan directory must remain within the project."
|
||||
exit 1
|
||||
}
|
||||
$activeItem = Get-Item -LiteralPath $ActiveFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not (Test-SafeActiveFile)) {
|
||||
Write-Error "Error: the active plan pointer must be a regular file within the project."
|
||||
exit 1
|
||||
}
|
||||
|
||||
$utf8NoBom = New-Object System.Text.UTF8Encoding($false)
|
||||
# Replace the directory entry instead of truncating an existing inode: a
|
||||
# hardlinked pointer must not overwrite another file. The exclusive temporary
|
||||
# file lives beside the pointer, keeping replacement on the same filesystem.
|
||||
$tempFile = Join-Path $PlanRoot ('.active_plan.' + [guid]::NewGuid().ToString('N') + '.tmp')
|
||||
$createdTemp = $false
|
||||
try {
|
||||
$stream = [IO.File]::Open($tempFile, [IO.FileMode]::CreateNew, [IO.FileAccess]::Write, [IO.FileShare]::None)
|
||||
$createdTemp = $true
|
||||
try {
|
||||
$bytes = $utf8NoBom.GetBytes($PlanId)
|
||||
$stream.Write($bytes, 0, $bytes.Length)
|
||||
$stream.Flush()
|
||||
} finally { $stream.Dispose() }
|
||||
if ($activeItem) {
|
||||
[IO.File]::Replace($tempFile, $ActiveFile, [NullString]::Value)
|
||||
} else {
|
||||
[IO.File]::Move($tempFile, $ActiveFile)
|
||||
}
|
||||
} catch {
|
||||
Write-Error "Error: could not set the active plan pointer: $($_.Exception.Message)"
|
||||
exit 1
|
||||
} finally {
|
||||
if ($createdTemp -and (Test-Path -LiteralPath $tempFile)) {
|
||||
Remove-Item -LiteralPath $tempFile -Force -ErrorAction SilentlyContinue
|
||||
}
|
||||
}
|
||||
Write-Output "Active plan set to: $PlanId"
|
||||
Write-Output "Path: $PlanDir"
|
||||
Write-Output ""
|
||||
Write-Output "To pin this terminal session only:"
|
||||
Write-Output "`$env:PLAN_ID = '$PlanId'"
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user