Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f21d94bbcb | ||
|
|
2d98d31943 | ||
|
|
3b358c5be7 | ||
|
|
77390d2a20 |
@@ -28,7 +28,7 @@ hooks:
|
||||
- type: command
|
||||
command: "SH=\"${CLAUDE_SKILL_DIR}/scripts/inject-plan.sh\"; [ -f \"$SH\" ] || SH=$(ls \"$HOME/.claude/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/inject-plan.sh\" 2>/dev/null | head -1); [ -n \"$SH\" ] && [ -f \"$SH\" ] && sh \"$SH\" --context=precompact; exit 0"
|
||||
metadata:
|
||||
version: "3.12.0"
|
||||
version: "3.12.1"
|
||||
---
|
||||
|
||||
# Planning with Files
|
||||
|
||||
@@ -32,6 +32,9 @@ param(
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
if (-not $script:IsWindowsHost) {
|
||||
throw "Safe no-follow descriptor operations are unavailable in this PowerShell script on Unix. Use scripts/attest-plan.sh instead."
|
||||
}
|
||||
if ($script:IsWindowsHost -and -not ("PwfAttestationNative" -as [type])) {
|
||||
Add-Type -TypeDefinition @'
|
||||
using System;
|
||||
@@ -382,6 +385,21 @@ function Resolve-ContainedPlanFile {
|
||||
} catch { return $null }
|
||||
}
|
||||
|
||||
function Test-SlugPlanDirectory {
|
||||
param([string] $Directory)
|
||||
try {
|
||||
$finalDirectory = [PwfAttestationNative]::FinalDirectoryPath($Directory)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
$planningDirectory = Split-Path -Parent $finalDirectory
|
||||
$planId = Split-Path -Leaf $finalDirectory
|
||||
return (
|
||||
(Split-Path -Leaf $planningDirectory) -eq ".planning" -and
|
||||
$planId -match '^[A-Za-z0-9_][A-Za-z0-9._-]*$'
|
||||
)
|
||||
}
|
||||
|
||||
function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
@@ -395,10 +413,17 @@ function Resolve-PlanFile {
|
||||
# fall through and attest an unrelated legacy-root plan.
|
||||
if ($env:PWF_PLAN_ROOT -or $env:PLAN_ID) { return $null }
|
||||
$activePointer = Join-Path (Join-Path (Get-Location) ".planning") ".active_plan"
|
||||
if (Test-Path -LiteralPath $activePointer) { return $null }
|
||||
$activePointerItem = Get-Item -LiteralPath $activePointer -Force -ErrorAction SilentlyContinue
|
||||
if ($activePointerItem) { return $null }
|
||||
|
||||
$legacy = Join-Path (Get-Location) "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory (Get-Location).Path)
|
||||
$currentDirectory = (Get-Location).Path
|
||||
if (Test-SlugPlanDirectory $currentDirectory) {
|
||||
$slugPlan = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $slugPlan -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
$legacy = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
function Get-AttestationPath {
|
||||
@@ -406,6 +431,9 @@ function Get-AttestationPath {
|
||||
$planDir = Split-Path -Parent $PlanFile
|
||||
$cwd = (Get-Location).Path
|
||||
if ($planDir -eq $cwd) {
|
||||
if (Test-SlugPlanDirectory $cwd) {
|
||||
return (Join-Path $cwd ".attestation")
|
||||
}
|
||||
return (Join-Path $cwd ".plan-attestation")
|
||||
}
|
||||
return (Join-Path $planDir ".attestation")
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
# 1. $PLAN_ID env var → ./.planning/$PLAN_ID/
|
||||
# 2. ./.planning/.active_plan
|
||||
# 3. Newest ./.planning/<dir>/ by mtime
|
||||
# 4. Legacy ./task_plan.md at project root
|
||||
# 4. Current directory when it is .planning/<valid-slug>/
|
||||
# 5. Legacy ./task_plan.md at project root
|
||||
#
|
||||
# Usage:
|
||||
# sh scripts/attest-plan.sh # attest the active plan
|
||||
@@ -21,6 +22,25 @@ set -u
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
RESOLVER="${SCRIPT_DIR}/resolve-plan-dir.sh"
|
||||
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
resolve_from_slug_cwd() {
|
||||
slug_cwd="$(pwd -P 2>/dev/null)" || return 1
|
||||
planning_dir="${slug_cwd%/*}"
|
||||
[ "${planning_dir##*/}" = ".planning" ] || return 1
|
||||
plan_id="${slug_cwd##*/}"
|
||||
slug_is_valid "${plan_id}" || return 1
|
||||
[ -f "${slug_cwd}/task_plan.md" ] || return 1
|
||||
printf "%s\n" "${slug_cwd}/task_plan.md"
|
||||
}
|
||||
|
||||
resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
@@ -30,6 +50,22 @@ resolve_plan_file() {
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Explicit selectors are bindings, not hints. If the shared resolver
|
||||
# rejected one, do not attest a different plan through a cwd fallback.
|
||||
if [ -n "${PWF_PLAN_ROOT:-}" ] || [ -n "${PLAN_ID:-}" ]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
# An absolute script path does not change the invoking shell's cwd. When
|
||||
# that cwd is a slug plan directory, keep slug-mode storage semantics
|
||||
# instead of misclassifying its task_plan.md as a legacy root plan.
|
||||
slug_plan_file="$(resolve_from_slug_cwd)" || slug_plan_file=""
|
||||
if [ -n "${slug_plan_file}" ]; then
|
||||
printf "%s\n" "${slug_plan_file}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "./task_plan.md" ]; then
|
||||
printf "%s\n" "./task_plan.md"
|
||||
return 0
|
||||
|
||||
@@ -27,27 +27,26 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Select a working interpreter, not merely the first executable name on PATH.
|
||||
# Validate candidate interpreters supplied by the selector wrappers below.
|
||||
# Windows Store app aliases can exist as python3.exe while refusing every
|
||||
# script invocation. Probe candidates privately and fail closed if none runs.
|
||||
select_python() {
|
||||
# PWF_TRUSTED_PYTHON is the explicit trust path. PYTHON_BIN remains a
|
||||
# compatibility alias. PATH discovery is a deliberate fallback: the hook
|
||||
# treats the caller's PATH as executable trust, but still requires the
|
||||
# resolved candidate to be an absolute regular executable.
|
||||
for _sp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}" "$(command -v python3 2>/dev/null)" "$(command -v python 2>/dev/null)"; do
|
||||
select_python_candidates() {
|
||||
for _sp_candidate in "$@"; do
|
||||
[ -n "$_sp_candidate" ] || continue
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
case "$_sp_candidate" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
# Git Bash cannot reliably test or invoke C:\... spelling.
|
||||
# Convert before every filesystem predicate and invocation.
|
||||
command -v cygpath >/dev/null 2>&1 || continue
|
||||
_sp_candidate="$(cygpath -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
# Convert with Git Bash's fixed system helper, never PATH.
|
||||
_sp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "$_sp_cygpath" ] && [ -x "$_sp_cygpath" ] || continue
|
||||
_sp_candidate="$("$_sp_cygpath" -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
[ -f "$_sp_candidate" ] || continue
|
||||
[ -x "$_sp_candidate" ] || continue
|
||||
if "$_sp_candidate" -c 'import sys; raise SystemExit(0 if sys.version_info >= (3, 8) else 1)' >/dev/null 2>&1; then
|
||||
@@ -58,6 +57,21 @@ select_python() {
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment may use only an interpreter path the caller explicitly trusted.
|
||||
select_explicit_python() {
|
||||
select_python_candidates "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"
|
||||
}
|
||||
|
||||
# After containment succeeds, PATH discovery remains a compatibility fallback
|
||||
# for hosts that do not export an interpreter path to direct hook invocations.
|
||||
select_python() {
|
||||
select_python_candidates \
|
||||
"${PWF_TRUSTED_PYTHON:-}" \
|
||||
"${PYTHON_BIN:-}" \
|
||||
"$(command -v python3 2>/dev/null)" \
|
||||
"$(command -v python 2>/dev/null)"
|
||||
}
|
||||
|
||||
# issue #195: per-invocation opt-out (PLANNING_DISABLED=1) for one-shot/CI
|
||||
# sessions that share a cwd with a plan but never opted into it.
|
||||
[ "${PLANNING_DISABLED:-}" = "1" ] && exit 0
|
||||
@@ -154,13 +168,24 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
# (Copied verbatim from resolve-plan-dir.sh so hook injection gets the same
|
||||
# symlink containment as the resolver — see security A1.3.)
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Matching is case-insensitive and works after slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils), then
|
||||
# readlink -f (older GNU), then the interpreter already validated by
|
||||
# select_python(). Prints the canonical absolute path on success; prints
|
||||
# nothing and returns 1 on a full miss so the caller can decide what to do.
|
||||
# The fallback must not rediscover or execute an unvalidated PATH interpreter.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
@@ -171,12 +196,8 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
if [ -n "${PWF_PYTHON:-}" ]; then
|
||||
out="$("${PWF_PYTHON}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -256,9 +277,9 @@ fi
|
||||
if [ -z "$RESOLVED" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; then RESOLVED="${PLAN_PREFIX}."; SCOPE="root"; fi
|
||||
[ -z "$RESOLVED" ] && exit 0
|
||||
|
||||
# Do not probe or execute any interpreter until a real, contained plan exists.
|
||||
# This keeps opt-out and no-plan hook fires side-effect free even when an
|
||||
# untrusted PYTHON_BIN or PATH entry points at an executable canary.
|
||||
# Do not probe or execute any interpreter until a real plan exists. Before
|
||||
# containment, only an explicit PWF_TRUSTED_PYTHON or PYTHON_BIN may be used.
|
||||
# PATH discovery remains deferred until containment succeeds.
|
||||
if [ "$SCOPE" = "root" ]; then
|
||||
PRECHECK_PLAN_FILE="${PLAN_PREFIX}task_plan.md"
|
||||
else
|
||||
@@ -266,8 +287,9 @@ else
|
||||
fi
|
||||
[ -f "$PRECHECK_PLAN_FILE" ] || exit 0
|
||||
[ -L "$PRECHECK_PLAN_FILE" ] && exit 0
|
||||
PWF_PYTHON="$(select_explicit_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
is_within_root "$PRECHECK_PLAN_FILE" || exit 0
|
||||
PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
[ -n "$PWF_PYTHON" ] || PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
|
||||
# Session attachment is evaluated only after plan existence is proven. A
|
||||
# stale sessions directory without any plan must not cause interpreter probes.
|
||||
|
||||
@@ -140,14 +140,17 @@ if ($env:PLAN_ID) {
|
||||
}
|
||||
}
|
||||
|
||||
if (Test-Path -LiteralPath $activeFile) {
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not $activeItem.PSIsContainer -and
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) {
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
} else {
|
||||
$planId = $null
|
||||
# Get-Item observes the link object even when its target is missing, unlike
|
||||
# Test-Path which follows the target. An active pointer that is a directory or
|
||||
# reparse point is an unsafe/ambiguous selector and must terminate resolution;
|
||||
# falling through would silently select and expose the newest unrelated plan.
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem) {
|
||||
if ($activeItem.PSIsContainer -or
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0)) {
|
||||
exit 0
|
||||
}
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
if ($planId -and (Test-ValidSlug $planId)) {
|
||||
$candidate = Join-Path $PlanRoot $planId
|
||||
if ((Test-Path $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
|
||||
|
||||
@@ -90,10 +90,54 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
@@ -105,12 +149,9 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -180,7 +221,8 @@ is_within_root() {
|
||||
}
|
||||
|
||||
# Portable mtime resolver. Tries GNU stat, BSD stat, BSD/macOS date -r,
|
||||
# python3, then perl. Returns "0" on full miss so callers can sort.
|
||||
# then an explicitly trusted Python interpreter. Returns "0" on a full miss
|
||||
# so newest-plan selection fails closed instead of executing from PATH.
|
||||
mtime_of() {
|
||||
target="$1"
|
||||
out="$(stat -c '%Y' "${target}" 2>/dev/null)"
|
||||
@@ -189,16 +231,9 @@ mtime_of() {
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
out="$(date -r "${target}" +%s 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
out="$(perl -e 'print((stat shift)[9])' "${target}" 2>/dev/null)"
|
||||
_mtime_python="$(trusted_python)" || _mtime_python=""
|
||||
if [ -n "${_mtime_python}" ]; then
|
||||
out="$("${_mtime_python}" -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
printf "0\n"
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
"name": "planning-with-files",
|
||||
"source": "./",
|
||||
"description": "Persistent project planning files with lifecycle hooks that inject selected plan context. Automatic recovery uses project files only. Explicit catchup modes may read same-project local session records to emit aggregate counts or bounded nonce-framed excerpts. Optional gated mode can request continuation on capable hosts and never runs commands declared in Markdown. No network upload path. Installs across 60+ agents.",
|
||||
"version": "3.12.0"
|
||||
"version": "3.12.1"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "planning-with-files",
|
||||
"version": "3.12.0",
|
||||
"version": "3.12.1",
|
||||
"description": "Persistent project planning files with lifecycle hooks that inject selected plan context. Automatic recovery uses project files only. Explicit catchup modes may read same-project local session records to emit aggregate counts or bounded nonce-framed excerpts. Optional gated mode can request continuation on capable hosts and never runs commands declared in Markdown. No network upload path. Works across 60+ agents and includes Arabic, German, Spanish, Simplified Chinese, and Traditional Chinese.",
|
||||
"author": {
|
||||
"name": "OthmanAdi",
|
||||
|
||||
@@ -36,7 +36,7 @@ hooks:
|
||||
- type: command
|
||||
command: "SH=\"\"; for c in \"${PWF_SCRIPT_DIR}/inject-plan.sh\" \"${CLAUDE_SKILL_DIR}/scripts/inject-plan.sh\" \"${CODEBUDDY_PLUGIN_ROOT}/scripts/inject-plan.sh\" \"$HOME/.codebuddy/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/inject-plan.sh\"; do [ -f \"$c\" ] && { SH=\"$c\"; break; }; done; [ -n \"$SH\" ] && sh \"$SH\" --context=precompact; exit 0"
|
||||
metadata:
|
||||
version: "3.12.0"
|
||||
version: "3.12.1"
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -32,6 +32,9 @@ param(
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
if (-not $script:IsWindowsHost) {
|
||||
throw "Safe no-follow descriptor operations are unavailable in this PowerShell script on Unix. Use scripts/attest-plan.sh instead."
|
||||
}
|
||||
if ($script:IsWindowsHost -and -not ("PwfAttestationNative" -as [type])) {
|
||||
Add-Type -TypeDefinition @'
|
||||
using System;
|
||||
@@ -382,6 +385,21 @@ function Resolve-ContainedPlanFile {
|
||||
} catch { return $null }
|
||||
}
|
||||
|
||||
function Test-SlugPlanDirectory {
|
||||
param([string] $Directory)
|
||||
try {
|
||||
$finalDirectory = [PwfAttestationNative]::FinalDirectoryPath($Directory)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
$planningDirectory = Split-Path -Parent $finalDirectory
|
||||
$planId = Split-Path -Leaf $finalDirectory
|
||||
return (
|
||||
(Split-Path -Leaf $planningDirectory) -eq ".planning" -and
|
||||
$planId -match '^[A-Za-z0-9_][A-Za-z0-9._-]*$'
|
||||
)
|
||||
}
|
||||
|
||||
function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
@@ -395,10 +413,17 @@ function Resolve-PlanFile {
|
||||
# fall through and attest an unrelated legacy-root plan.
|
||||
if ($env:PWF_PLAN_ROOT -or $env:PLAN_ID) { return $null }
|
||||
$activePointer = Join-Path (Join-Path (Get-Location) ".planning") ".active_plan"
|
||||
if (Test-Path -LiteralPath $activePointer) { return $null }
|
||||
$activePointerItem = Get-Item -LiteralPath $activePointer -Force -ErrorAction SilentlyContinue
|
||||
if ($activePointerItem) { return $null }
|
||||
|
||||
$legacy = Join-Path (Get-Location) "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory (Get-Location).Path)
|
||||
$currentDirectory = (Get-Location).Path
|
||||
if (Test-SlugPlanDirectory $currentDirectory) {
|
||||
$slugPlan = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $slugPlan -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
$legacy = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
function Get-AttestationPath {
|
||||
@@ -406,6 +431,9 @@ function Get-AttestationPath {
|
||||
$planDir = Split-Path -Parent $PlanFile
|
||||
$cwd = (Get-Location).Path
|
||||
if ($planDir -eq $cwd) {
|
||||
if (Test-SlugPlanDirectory $cwd) {
|
||||
return (Join-Path $cwd ".attestation")
|
||||
}
|
||||
return (Join-Path $cwd ".plan-attestation")
|
||||
}
|
||||
return (Join-Path $planDir ".attestation")
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
# 1. $PLAN_ID env var → ./.planning/$PLAN_ID/
|
||||
# 2. ./.planning/.active_plan
|
||||
# 3. Newest ./.planning/<dir>/ by mtime
|
||||
# 4. Legacy ./task_plan.md at project root
|
||||
# 4. Current directory when it is .planning/<valid-slug>/
|
||||
# 5. Legacy ./task_plan.md at project root
|
||||
#
|
||||
# Usage:
|
||||
# sh scripts/attest-plan.sh # attest the active plan
|
||||
@@ -21,6 +22,25 @@ set -u
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
RESOLVER="${SCRIPT_DIR}/resolve-plan-dir.sh"
|
||||
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
resolve_from_slug_cwd() {
|
||||
slug_cwd="$(pwd -P 2>/dev/null)" || return 1
|
||||
planning_dir="${slug_cwd%/*}"
|
||||
[ "${planning_dir##*/}" = ".planning" ] || return 1
|
||||
plan_id="${slug_cwd##*/}"
|
||||
slug_is_valid "${plan_id}" || return 1
|
||||
[ -f "${slug_cwd}/task_plan.md" ] || return 1
|
||||
printf "%s\n" "${slug_cwd}/task_plan.md"
|
||||
}
|
||||
|
||||
resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
@@ -30,6 +50,22 @@ resolve_plan_file() {
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Explicit selectors are bindings, not hints. If the shared resolver
|
||||
# rejected one, do not attest a different plan through a cwd fallback.
|
||||
if [ -n "${PWF_PLAN_ROOT:-}" ] || [ -n "${PLAN_ID:-}" ]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
# An absolute script path does not change the invoking shell's cwd. When
|
||||
# that cwd is a slug plan directory, keep slug-mode storage semantics
|
||||
# instead of misclassifying its task_plan.md as a legacy root plan.
|
||||
slug_plan_file="$(resolve_from_slug_cwd)" || slug_plan_file=""
|
||||
if [ -n "${slug_plan_file}" ]; then
|
||||
printf "%s\n" "${slug_plan_file}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "./task_plan.md" ]; then
|
||||
printf "%s\n" "./task_plan.md"
|
||||
return 0
|
||||
|
||||
@@ -27,27 +27,26 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Select a working interpreter, not merely the first executable name on PATH.
|
||||
# Validate candidate interpreters supplied by the selector wrappers below.
|
||||
# Windows Store app aliases can exist as python3.exe while refusing every
|
||||
# script invocation. Probe candidates privately and fail closed if none runs.
|
||||
select_python() {
|
||||
# PWF_TRUSTED_PYTHON is the explicit trust path. PYTHON_BIN remains a
|
||||
# compatibility alias. PATH discovery is a deliberate fallback: the hook
|
||||
# treats the caller's PATH as executable trust, but still requires the
|
||||
# resolved candidate to be an absolute regular executable.
|
||||
for _sp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}" "$(command -v python3 2>/dev/null)" "$(command -v python 2>/dev/null)"; do
|
||||
select_python_candidates() {
|
||||
for _sp_candidate in "$@"; do
|
||||
[ -n "$_sp_candidate" ] || continue
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
case "$_sp_candidate" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
# Git Bash cannot reliably test or invoke C:\... spelling.
|
||||
# Convert before every filesystem predicate and invocation.
|
||||
command -v cygpath >/dev/null 2>&1 || continue
|
||||
_sp_candidate="$(cygpath -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
# Convert with Git Bash's fixed system helper, never PATH.
|
||||
_sp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "$_sp_cygpath" ] && [ -x "$_sp_cygpath" ] || continue
|
||||
_sp_candidate="$("$_sp_cygpath" -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
[ -f "$_sp_candidate" ] || continue
|
||||
[ -x "$_sp_candidate" ] || continue
|
||||
if "$_sp_candidate" -c 'import sys; raise SystemExit(0 if sys.version_info >= (3, 8) else 1)' >/dev/null 2>&1; then
|
||||
@@ -58,6 +57,21 @@ select_python() {
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment may use only an interpreter path the caller explicitly trusted.
|
||||
select_explicit_python() {
|
||||
select_python_candidates "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"
|
||||
}
|
||||
|
||||
# After containment succeeds, PATH discovery remains a compatibility fallback
|
||||
# for hosts that do not export an interpreter path to direct hook invocations.
|
||||
select_python() {
|
||||
select_python_candidates \
|
||||
"${PWF_TRUSTED_PYTHON:-}" \
|
||||
"${PYTHON_BIN:-}" \
|
||||
"$(command -v python3 2>/dev/null)" \
|
||||
"$(command -v python 2>/dev/null)"
|
||||
}
|
||||
|
||||
# issue #195: per-invocation opt-out (PLANNING_DISABLED=1) for one-shot/CI
|
||||
# sessions that share a cwd with a plan but never opted into it.
|
||||
[ "${PLANNING_DISABLED:-}" = "1" ] && exit 0
|
||||
@@ -154,13 +168,24 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
# (Copied verbatim from resolve-plan-dir.sh so hook injection gets the same
|
||||
# symlink containment as the resolver — see security A1.3.)
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Matching is case-insensitive and works after slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils), then
|
||||
# readlink -f (older GNU), then the interpreter already validated by
|
||||
# select_python(). Prints the canonical absolute path on success; prints
|
||||
# nothing and returns 1 on a full miss so the caller can decide what to do.
|
||||
# The fallback must not rediscover or execute an unvalidated PATH interpreter.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
@@ -171,12 +196,8 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
if [ -n "${PWF_PYTHON:-}" ]; then
|
||||
out="$("${PWF_PYTHON}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -256,9 +277,9 @@ fi
|
||||
if [ -z "$RESOLVED" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; then RESOLVED="${PLAN_PREFIX}."; SCOPE="root"; fi
|
||||
[ -z "$RESOLVED" ] && exit 0
|
||||
|
||||
# Do not probe or execute any interpreter until a real, contained plan exists.
|
||||
# This keeps opt-out and no-plan hook fires side-effect free even when an
|
||||
# untrusted PYTHON_BIN or PATH entry points at an executable canary.
|
||||
# Do not probe or execute any interpreter until a real plan exists. Before
|
||||
# containment, only an explicit PWF_TRUSTED_PYTHON or PYTHON_BIN may be used.
|
||||
# PATH discovery remains deferred until containment succeeds.
|
||||
if [ "$SCOPE" = "root" ]; then
|
||||
PRECHECK_PLAN_FILE="${PLAN_PREFIX}task_plan.md"
|
||||
else
|
||||
@@ -266,8 +287,9 @@ else
|
||||
fi
|
||||
[ -f "$PRECHECK_PLAN_FILE" ] || exit 0
|
||||
[ -L "$PRECHECK_PLAN_FILE" ] && exit 0
|
||||
PWF_PYTHON="$(select_explicit_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
is_within_root "$PRECHECK_PLAN_FILE" || exit 0
|
||||
PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
[ -n "$PWF_PYTHON" ] || PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
|
||||
# Session attachment is evaluated only after plan existence is proven. A
|
||||
# stale sessions directory without any plan must not cause interpreter probes.
|
||||
|
||||
@@ -140,14 +140,17 @@ if ($env:PLAN_ID) {
|
||||
}
|
||||
}
|
||||
|
||||
if (Test-Path -LiteralPath $activeFile) {
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not $activeItem.PSIsContainer -and
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) {
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
} else {
|
||||
$planId = $null
|
||||
# Get-Item observes the link object even when its target is missing, unlike
|
||||
# Test-Path which follows the target. An active pointer that is a directory or
|
||||
# reparse point is an unsafe/ambiguous selector and must terminate resolution;
|
||||
# falling through would silently select and expose the newest unrelated plan.
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem) {
|
||||
if ($activeItem.PSIsContainer -or
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0)) {
|
||||
exit 0
|
||||
}
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
if ($planId -and (Test-ValidSlug $planId)) {
|
||||
$candidate = Join-Path $PlanRoot $planId
|
||||
if ((Test-Path $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
|
||||
|
||||
@@ -90,10 +90,54 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
@@ -105,12 +149,9 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -180,7 +221,8 @@ is_within_root() {
|
||||
}
|
||||
|
||||
# Portable mtime resolver. Tries GNU stat, BSD stat, BSD/macOS date -r,
|
||||
# python3, then perl. Returns "0" on full miss so callers can sort.
|
||||
# then an explicitly trusted Python interpreter. Returns "0" on a full miss
|
||||
# so newest-plan selection fails closed instead of executing from PATH.
|
||||
mtime_of() {
|
||||
target="$1"
|
||||
out="$(stat -c '%Y' "${target}" 2>/dev/null)"
|
||||
@@ -189,16 +231,9 @@ mtime_of() {
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
out="$(date -r "${target}" +%s 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
out="$(perl -e 'print((stat shift)[9])' "${target}" 2>/dev/null)"
|
||||
_mtime_python="$(trusted_python)" || _mtime_python=""
|
||||
if [ -n "${_mtime_python}" ]; then
|
||||
out="$("${_mtime_python}" -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
printf "0\n"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "planning-with-files",
|
||||
"version": "3.12.0",
|
||||
"version": "3.12.1",
|
||||
"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",
|
||||
|
||||
@@ -15,6 +15,11 @@ from typing import Any
|
||||
|
||||
HOOK_DIR = Path(__file__).resolve().parent
|
||||
_SAFE_LEGACY_SESSION_ID = re.compile(r"[A-Za-z0-9][A-Za-z0-9._-]{0,127}\Z")
|
||||
_DARWIN_SYSTEM_ALIASES = {
|
||||
Path("/var"): Path("/private/var"),
|
||||
Path("/tmp"): Path("/private/tmp"),
|
||||
Path("/etc"): Path("/private/etc"),
|
||||
}
|
||||
|
||||
|
||||
def load_payload() -> dict[str, Any]:
|
||||
@@ -80,13 +85,40 @@ def _is_reparse_or_link(path: Path) -> bool:
|
||||
return bool(attrs & reparse)
|
||||
|
||||
|
||||
def _is_trusted_darwin_system_alias(path: Path) -> bool:
|
||||
"""Admit only macOS's fixed root aliases after verifying their targets."""
|
||||
if sys.platform != "darwin":
|
||||
return False
|
||||
absolute = Path(os.path.abspath(path))
|
||||
expected = _DARWIN_SYSTEM_ALIASES.get(absolute)
|
||||
if expected is None:
|
||||
return False
|
||||
try:
|
||||
info = absolute.lstat()
|
||||
if not stat.S_ISLNK(info.st_mode):
|
||||
return False
|
||||
link_target = Path(os.readlink(absolute))
|
||||
if not link_target.is_absolute():
|
||||
link_target = absolute.parent / link_target
|
||||
if Path(os.path.normpath(link_target)) != expected:
|
||||
return False
|
||||
if Path(os.path.realpath(absolute)) != expected:
|
||||
return False
|
||||
target_info = expected.lstat()
|
||||
except (OSError, RuntimeError):
|
||||
return False
|
||||
return stat.S_ISDIR(target_info.st_mode) and not _is_reparse_or_link(expected)
|
||||
|
||||
|
||||
def _has_reparse_component(path: Path) -> bool:
|
||||
absolute = Path(os.path.abspath(path))
|
||||
current = Path(absolute.anchor)
|
||||
try:
|
||||
for part in absolute.parts[1:]:
|
||||
current /= part
|
||||
if _is_reparse_or_link(current):
|
||||
if _is_reparse_or_link(current) and not _is_trusted_darwin_system_alias(
|
||||
current
|
||||
):
|
||||
return True
|
||||
except (OSError, RuntimeError):
|
||||
return True
|
||||
|
||||
@@ -21,6 +21,11 @@ _WALL_CLOCK_UTC = re.compile(rb"T[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]+)?Z")
|
||||
_WALL_CLOCK_OFFSET = re.compile(
|
||||
rb"T[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]+)?([+-][0-9]{2}:[0-9]{2})"
|
||||
)
|
||||
_DARWIN_SYSTEM_ALIASES = {
|
||||
Path("/var"): Path("/private/var"),
|
||||
Path("/tmp"): Path("/private/tmp"),
|
||||
Path("/etc"): Path("/private/etc"),
|
||||
}
|
||||
|
||||
for _stream in (sys.stdout, sys.stderr):
|
||||
_reconfigure = getattr(_stream, "reconfigure", None)
|
||||
@@ -38,13 +43,37 @@ def _is_reparse_or_link_stat(info: os.stat_result) -> bool:
|
||||
return bool(attrs & getattr(stat, "FILE_ATTRIBUTE_REPARSE_POINT", 0x400))
|
||||
|
||||
|
||||
def _is_trusted_darwin_system_alias(path: Path, info: os.stat_result) -> bool:
|
||||
"""Admit only macOS's fixed root aliases after verifying their targets."""
|
||||
if sys.platform != "darwin" or not stat.S_ISLNK(info.st_mode):
|
||||
return False
|
||||
absolute = Path(os.path.abspath(path))
|
||||
expected = _DARWIN_SYSTEM_ALIASES.get(absolute)
|
||||
if expected is None:
|
||||
return False
|
||||
try:
|
||||
link_target = Path(os.readlink(absolute))
|
||||
if not link_target.is_absolute():
|
||||
link_target = absolute.parent / link_target
|
||||
if Path(os.path.normpath(link_target)) != expected:
|
||||
return False
|
||||
if Path(os.path.realpath(absolute)) != expected:
|
||||
return False
|
||||
target_info = expected.lstat()
|
||||
except (OSError, RuntimeError):
|
||||
return False
|
||||
return stat.S_ISDIR(target_info.st_mode) and not _is_reparse_or_link_stat(target_info)
|
||||
|
||||
|
||||
def _assert_no_reparse_components(path: Path) -> Path:
|
||||
absolute = Path(os.path.abspath(path))
|
||||
current = Path(absolute.anchor)
|
||||
for part in absolute.parts[1:]:
|
||||
current /= part
|
||||
info = current.lstat()
|
||||
if _is_reparse_or_link_stat(info):
|
||||
if _is_reparse_or_link_stat(info) and not _is_trusted_darwin_system_alias(
|
||||
current, info
|
||||
):
|
||||
raise ValueError("refusing symlink or reparse-point context path")
|
||||
return absolute
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ hooks:
|
||||
- type: command
|
||||
command: "SH=\"\"; for c in \"${PWF_SCRIPT_DIR}/inject-plan.sh\" \"${CLAUDE_SKILL_DIR}/scripts/inject-plan.sh\" \"$HOME/.codex/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/inject-plan.sh\"; do [ -f \"$c\" ] && { SH=\"$c\"; break; }; done; [ -n \"$SH\" ] && sh \"$SH\" --context=precompact; exit 0"
|
||||
metadata:
|
||||
version: "3.12.0"
|
||||
version: "3.12.1"
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -32,6 +32,9 @@ param(
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
if (-not $script:IsWindowsHost) {
|
||||
throw "Safe no-follow descriptor operations are unavailable in this PowerShell script on Unix. Use scripts/attest-plan.sh instead."
|
||||
}
|
||||
if ($script:IsWindowsHost -and -not ("PwfAttestationNative" -as [type])) {
|
||||
Add-Type -TypeDefinition @'
|
||||
using System;
|
||||
@@ -382,6 +385,21 @@ function Resolve-ContainedPlanFile {
|
||||
} catch { return $null }
|
||||
}
|
||||
|
||||
function Test-SlugPlanDirectory {
|
||||
param([string] $Directory)
|
||||
try {
|
||||
$finalDirectory = [PwfAttestationNative]::FinalDirectoryPath($Directory)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
$planningDirectory = Split-Path -Parent $finalDirectory
|
||||
$planId = Split-Path -Leaf $finalDirectory
|
||||
return (
|
||||
(Split-Path -Leaf $planningDirectory) -eq ".planning" -and
|
||||
$planId -match '^[A-Za-z0-9_][A-Za-z0-9._-]*$'
|
||||
)
|
||||
}
|
||||
|
||||
function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
@@ -395,10 +413,17 @@ function Resolve-PlanFile {
|
||||
# fall through and attest an unrelated legacy-root plan.
|
||||
if ($env:PWF_PLAN_ROOT -or $env:PLAN_ID) { return $null }
|
||||
$activePointer = Join-Path (Join-Path (Get-Location) ".planning") ".active_plan"
|
||||
if (Test-Path -LiteralPath $activePointer) { return $null }
|
||||
$activePointerItem = Get-Item -LiteralPath $activePointer -Force -ErrorAction SilentlyContinue
|
||||
if ($activePointerItem) { return $null }
|
||||
|
||||
$legacy = Join-Path (Get-Location) "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory (Get-Location).Path)
|
||||
$currentDirectory = (Get-Location).Path
|
||||
if (Test-SlugPlanDirectory $currentDirectory) {
|
||||
$slugPlan = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $slugPlan -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
$legacy = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
function Get-AttestationPath {
|
||||
@@ -406,6 +431,9 @@ function Get-AttestationPath {
|
||||
$planDir = Split-Path -Parent $PlanFile
|
||||
$cwd = (Get-Location).Path
|
||||
if ($planDir -eq $cwd) {
|
||||
if (Test-SlugPlanDirectory $cwd) {
|
||||
return (Join-Path $cwd ".attestation")
|
||||
}
|
||||
return (Join-Path $cwd ".plan-attestation")
|
||||
}
|
||||
return (Join-Path $planDir ".attestation")
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
# 1. $PLAN_ID env var → ./.planning/$PLAN_ID/
|
||||
# 2. ./.planning/.active_plan
|
||||
# 3. Newest ./.planning/<dir>/ by mtime
|
||||
# 4. Legacy ./task_plan.md at project root
|
||||
# 4. Current directory when it is .planning/<valid-slug>/
|
||||
# 5. Legacy ./task_plan.md at project root
|
||||
#
|
||||
# Usage:
|
||||
# sh scripts/attest-plan.sh # attest the active plan
|
||||
@@ -21,6 +22,25 @@ set -u
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
RESOLVER="${SCRIPT_DIR}/resolve-plan-dir.sh"
|
||||
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
resolve_from_slug_cwd() {
|
||||
slug_cwd="$(pwd -P 2>/dev/null)" || return 1
|
||||
planning_dir="${slug_cwd%/*}"
|
||||
[ "${planning_dir##*/}" = ".planning" ] || return 1
|
||||
plan_id="${slug_cwd##*/}"
|
||||
slug_is_valid "${plan_id}" || return 1
|
||||
[ -f "${slug_cwd}/task_plan.md" ] || return 1
|
||||
printf "%s\n" "${slug_cwd}/task_plan.md"
|
||||
}
|
||||
|
||||
resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
@@ -30,6 +50,22 @@ resolve_plan_file() {
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Explicit selectors are bindings, not hints. If the shared resolver
|
||||
# rejected one, do not attest a different plan through a cwd fallback.
|
||||
if [ -n "${PWF_PLAN_ROOT:-}" ] || [ -n "${PLAN_ID:-}" ]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
# An absolute script path does not change the invoking shell's cwd. When
|
||||
# that cwd is a slug plan directory, keep slug-mode storage semantics
|
||||
# instead of misclassifying its task_plan.md as a legacy root plan.
|
||||
slug_plan_file="$(resolve_from_slug_cwd)" || slug_plan_file=""
|
||||
if [ -n "${slug_plan_file}" ]; then
|
||||
printf "%s\n" "${slug_plan_file}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "./task_plan.md" ]; then
|
||||
printf "%s\n" "./task_plan.md"
|
||||
return 0
|
||||
|
||||
@@ -27,27 +27,26 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Select a working interpreter, not merely the first executable name on PATH.
|
||||
# Validate candidate interpreters supplied by the selector wrappers below.
|
||||
# Windows Store app aliases can exist as python3.exe while refusing every
|
||||
# script invocation. Probe candidates privately and fail closed if none runs.
|
||||
select_python() {
|
||||
# PWF_TRUSTED_PYTHON is the explicit trust path. PYTHON_BIN remains a
|
||||
# compatibility alias. PATH discovery is a deliberate fallback: the hook
|
||||
# treats the caller's PATH as executable trust, but still requires the
|
||||
# resolved candidate to be an absolute regular executable.
|
||||
for _sp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}" "$(command -v python3 2>/dev/null)" "$(command -v python 2>/dev/null)"; do
|
||||
select_python_candidates() {
|
||||
for _sp_candidate in "$@"; do
|
||||
[ -n "$_sp_candidate" ] || continue
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
case "$_sp_candidate" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
# Git Bash cannot reliably test or invoke C:\... spelling.
|
||||
# Convert before every filesystem predicate and invocation.
|
||||
command -v cygpath >/dev/null 2>&1 || continue
|
||||
_sp_candidate="$(cygpath -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
# Convert with Git Bash's fixed system helper, never PATH.
|
||||
_sp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "$_sp_cygpath" ] && [ -x "$_sp_cygpath" ] || continue
|
||||
_sp_candidate="$("$_sp_cygpath" -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
[ -f "$_sp_candidate" ] || continue
|
||||
[ -x "$_sp_candidate" ] || continue
|
||||
if "$_sp_candidate" -c 'import sys; raise SystemExit(0 if sys.version_info >= (3, 8) else 1)' >/dev/null 2>&1; then
|
||||
@@ -58,6 +57,21 @@ select_python() {
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment may use only an interpreter path the caller explicitly trusted.
|
||||
select_explicit_python() {
|
||||
select_python_candidates "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"
|
||||
}
|
||||
|
||||
# After containment succeeds, PATH discovery remains a compatibility fallback
|
||||
# for hosts that do not export an interpreter path to direct hook invocations.
|
||||
select_python() {
|
||||
select_python_candidates \
|
||||
"${PWF_TRUSTED_PYTHON:-}" \
|
||||
"${PYTHON_BIN:-}" \
|
||||
"$(command -v python3 2>/dev/null)" \
|
||||
"$(command -v python 2>/dev/null)"
|
||||
}
|
||||
|
||||
# issue #195: per-invocation opt-out (PLANNING_DISABLED=1) for one-shot/CI
|
||||
# sessions that share a cwd with a plan but never opted into it.
|
||||
[ "${PLANNING_DISABLED:-}" = "1" ] && exit 0
|
||||
@@ -154,13 +168,24 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
# (Copied verbatim from resolve-plan-dir.sh so hook injection gets the same
|
||||
# symlink containment as the resolver — see security A1.3.)
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Matching is case-insensitive and works after slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils), then
|
||||
# readlink -f (older GNU), then the interpreter already validated by
|
||||
# select_python(). Prints the canonical absolute path on success; prints
|
||||
# nothing and returns 1 on a full miss so the caller can decide what to do.
|
||||
# The fallback must not rediscover or execute an unvalidated PATH interpreter.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
@@ -171,12 +196,8 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
if [ -n "${PWF_PYTHON:-}" ]; then
|
||||
out="$("${PWF_PYTHON}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -256,9 +277,9 @@ fi
|
||||
if [ -z "$RESOLVED" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; then RESOLVED="${PLAN_PREFIX}."; SCOPE="root"; fi
|
||||
[ -z "$RESOLVED" ] && exit 0
|
||||
|
||||
# Do not probe or execute any interpreter until a real, contained plan exists.
|
||||
# This keeps opt-out and no-plan hook fires side-effect free even when an
|
||||
# untrusted PYTHON_BIN or PATH entry points at an executable canary.
|
||||
# Do not probe or execute any interpreter until a real plan exists. Before
|
||||
# containment, only an explicit PWF_TRUSTED_PYTHON or PYTHON_BIN may be used.
|
||||
# PATH discovery remains deferred until containment succeeds.
|
||||
if [ "$SCOPE" = "root" ]; then
|
||||
PRECHECK_PLAN_FILE="${PLAN_PREFIX}task_plan.md"
|
||||
else
|
||||
@@ -266,8 +287,9 @@ else
|
||||
fi
|
||||
[ -f "$PRECHECK_PLAN_FILE" ] || exit 0
|
||||
[ -L "$PRECHECK_PLAN_FILE" ] && exit 0
|
||||
PWF_PYTHON="$(select_explicit_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
is_within_root "$PRECHECK_PLAN_FILE" || exit 0
|
||||
PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
[ -n "$PWF_PYTHON" ] || PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
|
||||
# Session attachment is evaluated only after plan existence is proven. A
|
||||
# stale sessions directory without any plan must not cause interpreter probes.
|
||||
|
||||
@@ -140,14 +140,17 @@ if ($env:PLAN_ID) {
|
||||
}
|
||||
}
|
||||
|
||||
if (Test-Path -LiteralPath $activeFile) {
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not $activeItem.PSIsContainer -and
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) {
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
} else {
|
||||
$planId = $null
|
||||
# Get-Item observes the link object even when its target is missing, unlike
|
||||
# Test-Path which follows the target. An active pointer that is a directory or
|
||||
# reparse point is an unsafe/ambiguous selector and must terminate resolution;
|
||||
# falling through would silently select and expose the newest unrelated plan.
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem) {
|
||||
if ($activeItem.PSIsContainer -or
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0)) {
|
||||
exit 0
|
||||
}
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
if ($planId -and (Test-ValidSlug $planId)) {
|
||||
$candidate = Join-Path $PlanRoot $planId
|
||||
if ((Test-Path $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
|
||||
|
||||
@@ -90,10 +90,54 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
@@ -105,12 +149,9 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -180,7 +221,8 @@ is_within_root() {
|
||||
}
|
||||
|
||||
# Portable mtime resolver. Tries GNU stat, BSD stat, BSD/macOS date -r,
|
||||
# python3, then perl. Returns "0" on full miss so callers can sort.
|
||||
# then an explicitly trusted Python interpreter. Returns "0" on a full miss
|
||||
# so newest-plan selection fails closed instead of executing from PATH.
|
||||
mtime_of() {
|
||||
target="$1"
|
||||
out="$(stat -c '%Y' "${target}" 2>/dev/null)"
|
||||
@@ -189,16 +231,9 @@ mtime_of() {
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
out="$(date -r "${target}" +%s 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
out="$(perl -e 'print((stat shift)[9])' "${target}" 2>/dev/null)"
|
||||
_mtime_python="$(trusted_python)" || _mtime_python=""
|
||||
if [ -n "${_mtime_python}" ]; then
|
||||
out="$("${_mtime_python}" -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
printf "0\n"
|
||||
|
||||
@@ -32,6 +32,9 @@ param(
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
if (-not $script:IsWindowsHost) {
|
||||
throw "Safe no-follow descriptor operations are unavailable in this PowerShell script on Unix. Use scripts/attest-plan.sh instead."
|
||||
}
|
||||
if ($script:IsWindowsHost -and -not ("PwfAttestationNative" -as [type])) {
|
||||
Add-Type -TypeDefinition @'
|
||||
using System;
|
||||
@@ -382,6 +385,21 @@ function Resolve-ContainedPlanFile {
|
||||
} catch { return $null }
|
||||
}
|
||||
|
||||
function Test-SlugPlanDirectory {
|
||||
param([string] $Directory)
|
||||
try {
|
||||
$finalDirectory = [PwfAttestationNative]::FinalDirectoryPath($Directory)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
$planningDirectory = Split-Path -Parent $finalDirectory
|
||||
$planId = Split-Path -Leaf $finalDirectory
|
||||
return (
|
||||
(Split-Path -Leaf $planningDirectory) -eq ".planning" -and
|
||||
$planId -match '^[A-Za-z0-9_][A-Za-z0-9._-]*$'
|
||||
)
|
||||
}
|
||||
|
||||
function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
@@ -395,10 +413,17 @@ function Resolve-PlanFile {
|
||||
# fall through and attest an unrelated legacy-root plan.
|
||||
if ($env:PWF_PLAN_ROOT -or $env:PLAN_ID) { return $null }
|
||||
$activePointer = Join-Path (Join-Path (Get-Location) ".planning") ".active_plan"
|
||||
if (Test-Path -LiteralPath $activePointer) { return $null }
|
||||
$activePointerItem = Get-Item -LiteralPath $activePointer -Force -ErrorAction SilentlyContinue
|
||||
if ($activePointerItem) { return $null }
|
||||
|
||||
$legacy = Join-Path (Get-Location) "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory (Get-Location).Path)
|
||||
$currentDirectory = (Get-Location).Path
|
||||
if (Test-SlugPlanDirectory $currentDirectory) {
|
||||
$slugPlan = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $slugPlan -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
$legacy = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
function Get-AttestationPath {
|
||||
@@ -406,6 +431,9 @@ function Get-AttestationPath {
|
||||
$planDir = Split-Path -Parent $PlanFile
|
||||
$cwd = (Get-Location).Path
|
||||
if ($planDir -eq $cwd) {
|
||||
if (Test-SlugPlanDirectory $cwd) {
|
||||
return (Join-Path $cwd ".attestation")
|
||||
}
|
||||
return (Join-Path $cwd ".plan-attestation")
|
||||
}
|
||||
return (Join-Path $planDir ".attestation")
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
# 1. $PLAN_ID env var → ./.planning/$PLAN_ID/
|
||||
# 2. ./.planning/.active_plan
|
||||
# 3. Newest ./.planning/<dir>/ by mtime
|
||||
# 4. Legacy ./task_plan.md at project root
|
||||
# 4. Current directory when it is .planning/<valid-slug>/
|
||||
# 5. Legacy ./task_plan.md at project root
|
||||
#
|
||||
# Usage:
|
||||
# sh scripts/attest-plan.sh # attest the active plan
|
||||
@@ -21,6 +22,25 @@ set -u
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
RESOLVER="${SCRIPT_DIR}/resolve-plan-dir.sh"
|
||||
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
resolve_from_slug_cwd() {
|
||||
slug_cwd="$(pwd -P 2>/dev/null)" || return 1
|
||||
planning_dir="${slug_cwd%/*}"
|
||||
[ "${planning_dir##*/}" = ".planning" ] || return 1
|
||||
plan_id="${slug_cwd##*/}"
|
||||
slug_is_valid "${plan_id}" || return 1
|
||||
[ -f "${slug_cwd}/task_plan.md" ] || return 1
|
||||
printf "%s\n" "${slug_cwd}/task_plan.md"
|
||||
}
|
||||
|
||||
resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
@@ -30,6 +50,22 @@ resolve_plan_file() {
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Explicit selectors are bindings, not hints. If the shared resolver
|
||||
# rejected one, do not attest a different plan through a cwd fallback.
|
||||
if [ -n "${PWF_PLAN_ROOT:-}" ] || [ -n "${PLAN_ID:-}" ]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
# An absolute script path does not change the invoking shell's cwd. When
|
||||
# that cwd is a slug plan directory, keep slug-mode storage semantics
|
||||
# instead of misclassifying its task_plan.md as a legacy root plan.
|
||||
slug_plan_file="$(resolve_from_slug_cwd)" || slug_plan_file=""
|
||||
if [ -n "${slug_plan_file}" ]; then
|
||||
printf "%s\n" "${slug_plan_file}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "./task_plan.md" ]; then
|
||||
printf "%s\n" "./task_plan.md"
|
||||
return 0
|
||||
|
||||
@@ -140,14 +140,17 @@ if ($env:PLAN_ID) {
|
||||
}
|
||||
}
|
||||
|
||||
if (Test-Path -LiteralPath $activeFile) {
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not $activeItem.PSIsContainer -and
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) {
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
} else {
|
||||
$planId = $null
|
||||
# Get-Item observes the link object even when its target is missing, unlike
|
||||
# Test-Path which follows the target. An active pointer that is a directory or
|
||||
# reparse point is an unsafe/ambiguous selector and must terminate resolution;
|
||||
# falling through would silently select and expose the newest unrelated plan.
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem) {
|
||||
if ($activeItem.PSIsContainer -or
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0)) {
|
||||
exit 0
|
||||
}
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
if ($planId -and (Test-ValidSlug $planId)) {
|
||||
$candidate = Join-Path $PlanRoot $planId
|
||||
if ((Test-Path $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
|
||||
|
||||
@@ -90,10 +90,54 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
@@ -105,12 +149,9 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -180,7 +221,8 @@ is_within_root() {
|
||||
}
|
||||
|
||||
# Portable mtime resolver. Tries GNU stat, BSD stat, BSD/macOS date -r,
|
||||
# python3, then perl. Returns "0" on full miss so callers can sort.
|
||||
# then an explicitly trusted Python interpreter. Returns "0" on a full miss
|
||||
# so newest-plan selection fails closed instead of executing from PATH.
|
||||
mtime_of() {
|
||||
target="$1"
|
||||
out="$(stat -c '%Y' "${target}" 2>/dev/null)"
|
||||
@@ -189,16 +231,9 @@ mtime_of() {
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
out="$(date -r "${target}" +%s 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
out="$(perl -e 'print((stat shift)[9])' "${target}" 2>/dev/null)"
|
||||
_mtime_python="$(trusted_python)" || _mtime_python=""
|
||||
if [ -n "${_mtime_python}" ]; then
|
||||
out="$("${_mtime_python}" -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
printf "0\n"
|
||||
|
||||
@@ -36,7 +36,7 @@ hooks:
|
||||
- type: command
|
||||
command: "SH=\"\"; for c in \"${PWF_SCRIPT_DIR}/inject-plan.sh\" \"${CLAUDE_SKILL_DIR}/scripts/inject-plan.sh\" \"$HOME/.cursor/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/inject-plan.sh\"; do [ -f \"$c\" ] && { SH=\"$c\"; break; }; done; [ -n \"$SH\" ] && sh \"$SH\" --context=precompact; exit 0"
|
||||
metadata:
|
||||
version: "3.12.0"
|
||||
version: "3.12.1"
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -32,6 +32,9 @@ param(
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
if (-not $script:IsWindowsHost) {
|
||||
throw "Safe no-follow descriptor operations are unavailable in this PowerShell script on Unix. Use scripts/attest-plan.sh instead."
|
||||
}
|
||||
if ($script:IsWindowsHost -and -not ("PwfAttestationNative" -as [type])) {
|
||||
Add-Type -TypeDefinition @'
|
||||
using System;
|
||||
@@ -382,6 +385,21 @@ function Resolve-ContainedPlanFile {
|
||||
} catch { return $null }
|
||||
}
|
||||
|
||||
function Test-SlugPlanDirectory {
|
||||
param([string] $Directory)
|
||||
try {
|
||||
$finalDirectory = [PwfAttestationNative]::FinalDirectoryPath($Directory)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
$planningDirectory = Split-Path -Parent $finalDirectory
|
||||
$planId = Split-Path -Leaf $finalDirectory
|
||||
return (
|
||||
(Split-Path -Leaf $planningDirectory) -eq ".planning" -and
|
||||
$planId -match '^[A-Za-z0-9_][A-Za-z0-9._-]*$'
|
||||
)
|
||||
}
|
||||
|
||||
function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
@@ -395,10 +413,17 @@ function Resolve-PlanFile {
|
||||
# fall through and attest an unrelated legacy-root plan.
|
||||
if ($env:PWF_PLAN_ROOT -or $env:PLAN_ID) { return $null }
|
||||
$activePointer = Join-Path (Join-Path (Get-Location) ".planning") ".active_plan"
|
||||
if (Test-Path -LiteralPath $activePointer) { return $null }
|
||||
$activePointerItem = Get-Item -LiteralPath $activePointer -Force -ErrorAction SilentlyContinue
|
||||
if ($activePointerItem) { return $null }
|
||||
|
||||
$legacy = Join-Path (Get-Location) "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory (Get-Location).Path)
|
||||
$currentDirectory = (Get-Location).Path
|
||||
if (Test-SlugPlanDirectory $currentDirectory) {
|
||||
$slugPlan = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $slugPlan -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
$legacy = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
function Get-AttestationPath {
|
||||
@@ -406,6 +431,9 @@ function Get-AttestationPath {
|
||||
$planDir = Split-Path -Parent $PlanFile
|
||||
$cwd = (Get-Location).Path
|
||||
if ($planDir -eq $cwd) {
|
||||
if (Test-SlugPlanDirectory $cwd) {
|
||||
return (Join-Path $cwd ".attestation")
|
||||
}
|
||||
return (Join-Path $cwd ".plan-attestation")
|
||||
}
|
||||
return (Join-Path $planDir ".attestation")
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
# 1. $PLAN_ID env var → ./.planning/$PLAN_ID/
|
||||
# 2. ./.planning/.active_plan
|
||||
# 3. Newest ./.planning/<dir>/ by mtime
|
||||
# 4. Legacy ./task_plan.md at project root
|
||||
# 4. Current directory when it is .planning/<valid-slug>/
|
||||
# 5. Legacy ./task_plan.md at project root
|
||||
#
|
||||
# Usage:
|
||||
# sh scripts/attest-plan.sh # attest the active plan
|
||||
@@ -21,6 +22,25 @@ set -u
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
RESOLVER="${SCRIPT_DIR}/resolve-plan-dir.sh"
|
||||
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
resolve_from_slug_cwd() {
|
||||
slug_cwd="$(pwd -P 2>/dev/null)" || return 1
|
||||
planning_dir="${slug_cwd%/*}"
|
||||
[ "${planning_dir##*/}" = ".planning" ] || return 1
|
||||
plan_id="${slug_cwd##*/}"
|
||||
slug_is_valid "${plan_id}" || return 1
|
||||
[ -f "${slug_cwd}/task_plan.md" ] || return 1
|
||||
printf "%s\n" "${slug_cwd}/task_plan.md"
|
||||
}
|
||||
|
||||
resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
@@ -30,6 +50,22 @@ resolve_plan_file() {
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Explicit selectors are bindings, not hints. If the shared resolver
|
||||
# rejected one, do not attest a different plan through a cwd fallback.
|
||||
if [ -n "${PWF_PLAN_ROOT:-}" ] || [ -n "${PLAN_ID:-}" ]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
# An absolute script path does not change the invoking shell's cwd. When
|
||||
# that cwd is a slug plan directory, keep slug-mode storage semantics
|
||||
# instead of misclassifying its task_plan.md as a legacy root plan.
|
||||
slug_plan_file="$(resolve_from_slug_cwd)" || slug_plan_file=""
|
||||
if [ -n "${slug_plan_file}" ]; then
|
||||
printf "%s\n" "${slug_plan_file}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "./task_plan.md" ]; then
|
||||
printf "%s\n" "./task_plan.md"
|
||||
return 0
|
||||
|
||||
@@ -27,27 +27,26 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Select a working interpreter, not merely the first executable name on PATH.
|
||||
# Validate candidate interpreters supplied by the selector wrappers below.
|
||||
# Windows Store app aliases can exist as python3.exe while refusing every
|
||||
# script invocation. Probe candidates privately and fail closed if none runs.
|
||||
select_python() {
|
||||
# PWF_TRUSTED_PYTHON is the explicit trust path. PYTHON_BIN remains a
|
||||
# compatibility alias. PATH discovery is a deliberate fallback: the hook
|
||||
# treats the caller's PATH as executable trust, but still requires the
|
||||
# resolved candidate to be an absolute regular executable.
|
||||
for _sp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}" "$(command -v python3 2>/dev/null)" "$(command -v python 2>/dev/null)"; do
|
||||
select_python_candidates() {
|
||||
for _sp_candidate in "$@"; do
|
||||
[ -n "$_sp_candidate" ] || continue
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
case "$_sp_candidate" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
# Git Bash cannot reliably test or invoke C:\... spelling.
|
||||
# Convert before every filesystem predicate and invocation.
|
||||
command -v cygpath >/dev/null 2>&1 || continue
|
||||
_sp_candidate="$(cygpath -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
# Convert with Git Bash's fixed system helper, never PATH.
|
||||
_sp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "$_sp_cygpath" ] && [ -x "$_sp_cygpath" ] || continue
|
||||
_sp_candidate="$("$_sp_cygpath" -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
[ -f "$_sp_candidate" ] || continue
|
||||
[ -x "$_sp_candidate" ] || continue
|
||||
if "$_sp_candidate" -c 'import sys; raise SystemExit(0 if sys.version_info >= (3, 8) else 1)' >/dev/null 2>&1; then
|
||||
@@ -58,6 +57,21 @@ select_python() {
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment may use only an interpreter path the caller explicitly trusted.
|
||||
select_explicit_python() {
|
||||
select_python_candidates "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"
|
||||
}
|
||||
|
||||
# After containment succeeds, PATH discovery remains a compatibility fallback
|
||||
# for hosts that do not export an interpreter path to direct hook invocations.
|
||||
select_python() {
|
||||
select_python_candidates \
|
||||
"${PWF_TRUSTED_PYTHON:-}" \
|
||||
"${PYTHON_BIN:-}" \
|
||||
"$(command -v python3 2>/dev/null)" \
|
||||
"$(command -v python 2>/dev/null)"
|
||||
}
|
||||
|
||||
# issue #195: per-invocation opt-out (PLANNING_DISABLED=1) for one-shot/CI
|
||||
# sessions that share a cwd with a plan but never opted into it.
|
||||
[ "${PLANNING_DISABLED:-}" = "1" ] && exit 0
|
||||
@@ -154,13 +168,24 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
# (Copied verbatim from resolve-plan-dir.sh so hook injection gets the same
|
||||
# symlink containment as the resolver — see security A1.3.)
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Matching is case-insensitive and works after slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils), then
|
||||
# readlink -f (older GNU), then the interpreter already validated by
|
||||
# select_python(). Prints the canonical absolute path on success; prints
|
||||
# nothing and returns 1 on a full miss so the caller can decide what to do.
|
||||
# The fallback must not rediscover or execute an unvalidated PATH interpreter.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
@@ -171,12 +196,8 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
if [ -n "${PWF_PYTHON:-}" ]; then
|
||||
out="$("${PWF_PYTHON}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -256,9 +277,9 @@ fi
|
||||
if [ -z "$RESOLVED" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; then RESOLVED="${PLAN_PREFIX}."; SCOPE="root"; fi
|
||||
[ -z "$RESOLVED" ] && exit 0
|
||||
|
||||
# Do not probe or execute any interpreter until a real, contained plan exists.
|
||||
# This keeps opt-out and no-plan hook fires side-effect free even when an
|
||||
# untrusted PYTHON_BIN or PATH entry points at an executable canary.
|
||||
# Do not probe or execute any interpreter until a real plan exists. Before
|
||||
# containment, only an explicit PWF_TRUSTED_PYTHON or PYTHON_BIN may be used.
|
||||
# PATH discovery remains deferred until containment succeeds.
|
||||
if [ "$SCOPE" = "root" ]; then
|
||||
PRECHECK_PLAN_FILE="${PLAN_PREFIX}task_plan.md"
|
||||
else
|
||||
@@ -266,8 +287,9 @@ else
|
||||
fi
|
||||
[ -f "$PRECHECK_PLAN_FILE" ] || exit 0
|
||||
[ -L "$PRECHECK_PLAN_FILE" ] && exit 0
|
||||
PWF_PYTHON="$(select_explicit_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
is_within_root "$PRECHECK_PLAN_FILE" || exit 0
|
||||
PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
[ -n "$PWF_PYTHON" ] || PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
|
||||
# Session attachment is evaluated only after plan existence is proven. A
|
||||
# stale sessions directory without any plan must not cause interpreter probes.
|
||||
|
||||
@@ -140,14 +140,17 @@ if ($env:PLAN_ID) {
|
||||
}
|
||||
}
|
||||
|
||||
if (Test-Path -LiteralPath $activeFile) {
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not $activeItem.PSIsContainer -and
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) {
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
} else {
|
||||
$planId = $null
|
||||
# Get-Item observes the link object even when its target is missing, unlike
|
||||
# Test-Path which follows the target. An active pointer that is a directory or
|
||||
# reparse point is an unsafe/ambiguous selector and must terminate resolution;
|
||||
# falling through would silently select and expose the newest unrelated plan.
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem) {
|
||||
if ($activeItem.PSIsContainer -or
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0)) {
|
||||
exit 0
|
||||
}
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
if ($planId -and (Test-ValidSlug $planId)) {
|
||||
$candidate = Join-Path $PlanRoot $planId
|
||||
if ((Test-Path $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
|
||||
|
||||
@@ -90,10 +90,54 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
@@ -105,12 +149,9 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -180,7 +221,8 @@ is_within_root() {
|
||||
}
|
||||
|
||||
# Portable mtime resolver. Tries GNU stat, BSD stat, BSD/macOS date -r,
|
||||
# python3, then perl. Returns "0" on full miss so callers can sort.
|
||||
# then an explicitly trusted Python interpreter. Returns "0" on a full miss
|
||||
# so newest-plan selection fails closed instead of executing from PATH.
|
||||
mtime_of() {
|
||||
target="$1"
|
||||
out="$(stat -c '%Y' "${target}" 2>/dev/null)"
|
||||
@@ -189,16 +231,9 @@ mtime_of() {
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
out="$(date -r "${target}" +%s 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
out="$(perl -e 'print((stat shift)[9])' "${target}" 2>/dev/null)"
|
||||
_mtime_python="$(trusted_python)" || _mtime_python=""
|
||||
if [ -n "${_mtime_python}" ]; then
|
||||
out="$("${_mtime_python}" -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
printf "0\n"
|
||||
|
||||
@@ -36,7 +36,7 @@ hooks:
|
||||
- type: command
|
||||
command: "SH=\"\"; for c in \"${PWF_SCRIPT_DIR}/inject-plan.sh\" \"${CLAUDE_SKILL_DIR}/scripts/inject-plan.sh\" \"$HOME/.factory/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/inject-plan.sh\"; do [ -f \"$c\" ] && { SH=\"$c\"; break; }; done; [ -n \"$SH\" ] && sh \"$SH\" --context=precompact; exit 0"
|
||||
metadata:
|
||||
version: "3.12.0"
|
||||
version: "3.12.1"
|
||||
---
|
||||
|
||||
# Planning with Files
|
||||
|
||||
@@ -32,6 +32,9 @@ param(
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
if (-not $script:IsWindowsHost) {
|
||||
throw "Safe no-follow descriptor operations are unavailable in this PowerShell script on Unix. Use scripts/attest-plan.sh instead."
|
||||
}
|
||||
if ($script:IsWindowsHost -and -not ("PwfAttestationNative" -as [type])) {
|
||||
Add-Type -TypeDefinition @'
|
||||
using System;
|
||||
@@ -382,6 +385,21 @@ function Resolve-ContainedPlanFile {
|
||||
} catch { return $null }
|
||||
}
|
||||
|
||||
function Test-SlugPlanDirectory {
|
||||
param([string] $Directory)
|
||||
try {
|
||||
$finalDirectory = [PwfAttestationNative]::FinalDirectoryPath($Directory)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
$planningDirectory = Split-Path -Parent $finalDirectory
|
||||
$planId = Split-Path -Leaf $finalDirectory
|
||||
return (
|
||||
(Split-Path -Leaf $planningDirectory) -eq ".planning" -and
|
||||
$planId -match '^[A-Za-z0-9_][A-Za-z0-9._-]*$'
|
||||
)
|
||||
}
|
||||
|
||||
function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
@@ -395,10 +413,17 @@ function Resolve-PlanFile {
|
||||
# fall through and attest an unrelated legacy-root plan.
|
||||
if ($env:PWF_PLAN_ROOT -or $env:PLAN_ID) { return $null }
|
||||
$activePointer = Join-Path (Join-Path (Get-Location) ".planning") ".active_plan"
|
||||
if (Test-Path -LiteralPath $activePointer) { return $null }
|
||||
$activePointerItem = Get-Item -LiteralPath $activePointer -Force -ErrorAction SilentlyContinue
|
||||
if ($activePointerItem) { return $null }
|
||||
|
||||
$legacy = Join-Path (Get-Location) "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory (Get-Location).Path)
|
||||
$currentDirectory = (Get-Location).Path
|
||||
if (Test-SlugPlanDirectory $currentDirectory) {
|
||||
$slugPlan = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $slugPlan -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
$legacy = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
function Get-AttestationPath {
|
||||
@@ -406,6 +431,9 @@ function Get-AttestationPath {
|
||||
$planDir = Split-Path -Parent $PlanFile
|
||||
$cwd = (Get-Location).Path
|
||||
if ($planDir -eq $cwd) {
|
||||
if (Test-SlugPlanDirectory $cwd) {
|
||||
return (Join-Path $cwd ".attestation")
|
||||
}
|
||||
return (Join-Path $cwd ".plan-attestation")
|
||||
}
|
||||
return (Join-Path $planDir ".attestation")
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
# 1. $PLAN_ID env var → ./.planning/$PLAN_ID/
|
||||
# 2. ./.planning/.active_plan
|
||||
# 3. Newest ./.planning/<dir>/ by mtime
|
||||
# 4. Legacy ./task_plan.md at project root
|
||||
# 4. Current directory when it is .planning/<valid-slug>/
|
||||
# 5. Legacy ./task_plan.md at project root
|
||||
#
|
||||
# Usage:
|
||||
# sh scripts/attest-plan.sh # attest the active plan
|
||||
@@ -21,6 +22,25 @@ set -u
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
RESOLVER="${SCRIPT_DIR}/resolve-plan-dir.sh"
|
||||
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
resolve_from_slug_cwd() {
|
||||
slug_cwd="$(pwd -P 2>/dev/null)" || return 1
|
||||
planning_dir="${slug_cwd%/*}"
|
||||
[ "${planning_dir##*/}" = ".planning" ] || return 1
|
||||
plan_id="${slug_cwd##*/}"
|
||||
slug_is_valid "${plan_id}" || return 1
|
||||
[ -f "${slug_cwd}/task_plan.md" ] || return 1
|
||||
printf "%s\n" "${slug_cwd}/task_plan.md"
|
||||
}
|
||||
|
||||
resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
@@ -30,6 +50,22 @@ resolve_plan_file() {
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Explicit selectors are bindings, not hints. If the shared resolver
|
||||
# rejected one, do not attest a different plan through a cwd fallback.
|
||||
if [ -n "${PWF_PLAN_ROOT:-}" ] || [ -n "${PLAN_ID:-}" ]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
# An absolute script path does not change the invoking shell's cwd. When
|
||||
# that cwd is a slug plan directory, keep slug-mode storage semantics
|
||||
# instead of misclassifying its task_plan.md as a legacy root plan.
|
||||
slug_plan_file="$(resolve_from_slug_cwd)" || slug_plan_file=""
|
||||
if [ -n "${slug_plan_file}" ]; then
|
||||
printf "%s\n" "${slug_plan_file}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "./task_plan.md" ]; then
|
||||
printf "%s\n" "./task_plan.md"
|
||||
return 0
|
||||
|
||||
@@ -27,27 +27,26 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Select a working interpreter, not merely the first executable name on PATH.
|
||||
# Validate candidate interpreters supplied by the selector wrappers below.
|
||||
# Windows Store app aliases can exist as python3.exe while refusing every
|
||||
# script invocation. Probe candidates privately and fail closed if none runs.
|
||||
select_python() {
|
||||
# PWF_TRUSTED_PYTHON is the explicit trust path. PYTHON_BIN remains a
|
||||
# compatibility alias. PATH discovery is a deliberate fallback: the hook
|
||||
# treats the caller's PATH as executable trust, but still requires the
|
||||
# resolved candidate to be an absolute regular executable.
|
||||
for _sp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}" "$(command -v python3 2>/dev/null)" "$(command -v python 2>/dev/null)"; do
|
||||
select_python_candidates() {
|
||||
for _sp_candidate in "$@"; do
|
||||
[ -n "$_sp_candidate" ] || continue
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
case "$_sp_candidate" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
# Git Bash cannot reliably test or invoke C:\... spelling.
|
||||
# Convert before every filesystem predicate and invocation.
|
||||
command -v cygpath >/dev/null 2>&1 || continue
|
||||
_sp_candidate="$(cygpath -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
# Convert with Git Bash's fixed system helper, never PATH.
|
||||
_sp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "$_sp_cygpath" ] && [ -x "$_sp_cygpath" ] || continue
|
||||
_sp_candidate="$("$_sp_cygpath" -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
[ -f "$_sp_candidate" ] || continue
|
||||
[ -x "$_sp_candidate" ] || continue
|
||||
if "$_sp_candidate" -c 'import sys; raise SystemExit(0 if sys.version_info >= (3, 8) else 1)' >/dev/null 2>&1; then
|
||||
@@ -58,6 +57,21 @@ select_python() {
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment may use only an interpreter path the caller explicitly trusted.
|
||||
select_explicit_python() {
|
||||
select_python_candidates "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"
|
||||
}
|
||||
|
||||
# After containment succeeds, PATH discovery remains a compatibility fallback
|
||||
# for hosts that do not export an interpreter path to direct hook invocations.
|
||||
select_python() {
|
||||
select_python_candidates \
|
||||
"${PWF_TRUSTED_PYTHON:-}" \
|
||||
"${PYTHON_BIN:-}" \
|
||||
"$(command -v python3 2>/dev/null)" \
|
||||
"$(command -v python 2>/dev/null)"
|
||||
}
|
||||
|
||||
# issue #195: per-invocation opt-out (PLANNING_DISABLED=1) for one-shot/CI
|
||||
# sessions that share a cwd with a plan but never opted into it.
|
||||
[ "${PLANNING_DISABLED:-}" = "1" ] && exit 0
|
||||
@@ -154,13 +168,24 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
# (Copied verbatim from resolve-plan-dir.sh so hook injection gets the same
|
||||
# symlink containment as the resolver — see security A1.3.)
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Matching is case-insensitive and works after slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils), then
|
||||
# readlink -f (older GNU), then the interpreter already validated by
|
||||
# select_python(). Prints the canonical absolute path on success; prints
|
||||
# nothing and returns 1 on a full miss so the caller can decide what to do.
|
||||
# The fallback must not rediscover or execute an unvalidated PATH interpreter.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
@@ -171,12 +196,8 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
if [ -n "${PWF_PYTHON:-}" ]; then
|
||||
out="$("${PWF_PYTHON}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -256,9 +277,9 @@ fi
|
||||
if [ -z "$RESOLVED" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; then RESOLVED="${PLAN_PREFIX}."; SCOPE="root"; fi
|
||||
[ -z "$RESOLVED" ] && exit 0
|
||||
|
||||
# Do not probe or execute any interpreter until a real, contained plan exists.
|
||||
# This keeps opt-out and no-plan hook fires side-effect free even when an
|
||||
# untrusted PYTHON_BIN or PATH entry points at an executable canary.
|
||||
# Do not probe or execute any interpreter until a real plan exists. Before
|
||||
# containment, only an explicit PWF_TRUSTED_PYTHON or PYTHON_BIN may be used.
|
||||
# PATH discovery remains deferred until containment succeeds.
|
||||
if [ "$SCOPE" = "root" ]; then
|
||||
PRECHECK_PLAN_FILE="${PLAN_PREFIX}task_plan.md"
|
||||
else
|
||||
@@ -266,8 +287,9 @@ else
|
||||
fi
|
||||
[ -f "$PRECHECK_PLAN_FILE" ] || exit 0
|
||||
[ -L "$PRECHECK_PLAN_FILE" ] && exit 0
|
||||
PWF_PYTHON="$(select_explicit_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
is_within_root "$PRECHECK_PLAN_FILE" || exit 0
|
||||
PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
[ -n "$PWF_PYTHON" ] || PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
|
||||
# Session attachment is evaluated only after plan existence is proven. A
|
||||
# stale sessions directory without any plan must not cause interpreter probes.
|
||||
|
||||
@@ -140,14 +140,17 @@ if ($env:PLAN_ID) {
|
||||
}
|
||||
}
|
||||
|
||||
if (Test-Path -LiteralPath $activeFile) {
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not $activeItem.PSIsContainer -and
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) {
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
} else {
|
||||
$planId = $null
|
||||
# Get-Item observes the link object even when its target is missing, unlike
|
||||
# Test-Path which follows the target. An active pointer that is a directory or
|
||||
# reparse point is an unsafe/ambiguous selector and must terminate resolution;
|
||||
# falling through would silently select and expose the newest unrelated plan.
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem) {
|
||||
if ($activeItem.PSIsContainer -or
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0)) {
|
||||
exit 0
|
||||
}
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
if ($planId -and (Test-ValidSlug $planId)) {
|
||||
$candidate = Join-Path $PlanRoot $planId
|
||||
if ((Test-Path $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
|
||||
|
||||
@@ -90,10 +90,54 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
@@ -105,12 +149,9 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -180,7 +221,8 @@ is_within_root() {
|
||||
}
|
||||
|
||||
# Portable mtime resolver. Tries GNU stat, BSD stat, BSD/macOS date -r,
|
||||
# python3, then perl. Returns "0" on full miss so callers can sort.
|
||||
# then an explicitly trusted Python interpreter. Returns "0" on a full miss
|
||||
# so newest-plan selection fails closed instead of executing from PATH.
|
||||
mtime_of() {
|
||||
target="$1"
|
||||
out="$(stat -c '%Y' "${target}" 2>/dev/null)"
|
||||
@@ -189,16 +231,9 @@ mtime_of() {
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
out="$(date -r "${target}" +%s 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
out="$(perl -e 'print((stat shift)[9])' "${target}" 2>/dev/null)"
|
||||
_mtime_python="$(trusted_python)" || _mtime_python=""
|
||||
if [ -n "${_mtime_python}" ]; then
|
||||
out="$("${_mtime_python}" -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
printf "0\n"
|
||||
|
||||
@@ -32,6 +32,9 @@ param(
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
if (-not $script:IsWindowsHost) {
|
||||
throw "Safe no-follow descriptor operations are unavailable in this PowerShell script on Unix. Use scripts/attest-plan.sh instead."
|
||||
}
|
||||
if ($script:IsWindowsHost -and -not ("PwfAttestationNative" -as [type])) {
|
||||
Add-Type -TypeDefinition @'
|
||||
using System;
|
||||
@@ -382,6 +385,21 @@ function Resolve-ContainedPlanFile {
|
||||
} catch { return $null }
|
||||
}
|
||||
|
||||
function Test-SlugPlanDirectory {
|
||||
param([string] $Directory)
|
||||
try {
|
||||
$finalDirectory = [PwfAttestationNative]::FinalDirectoryPath($Directory)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
$planningDirectory = Split-Path -Parent $finalDirectory
|
||||
$planId = Split-Path -Leaf $finalDirectory
|
||||
return (
|
||||
(Split-Path -Leaf $planningDirectory) -eq ".planning" -and
|
||||
$planId -match '^[A-Za-z0-9_][A-Za-z0-9._-]*$'
|
||||
)
|
||||
}
|
||||
|
||||
function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
@@ -395,10 +413,17 @@ function Resolve-PlanFile {
|
||||
# fall through and attest an unrelated legacy-root plan.
|
||||
if ($env:PWF_PLAN_ROOT -or $env:PLAN_ID) { return $null }
|
||||
$activePointer = Join-Path (Join-Path (Get-Location) ".planning") ".active_plan"
|
||||
if (Test-Path -LiteralPath $activePointer) { return $null }
|
||||
$activePointerItem = Get-Item -LiteralPath $activePointer -Force -ErrorAction SilentlyContinue
|
||||
if ($activePointerItem) { return $null }
|
||||
|
||||
$legacy = Join-Path (Get-Location) "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory (Get-Location).Path)
|
||||
$currentDirectory = (Get-Location).Path
|
||||
if (Test-SlugPlanDirectory $currentDirectory) {
|
||||
$slugPlan = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $slugPlan -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
$legacy = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
function Get-AttestationPath {
|
||||
@@ -406,6 +431,9 @@ function Get-AttestationPath {
|
||||
$planDir = Split-Path -Parent $PlanFile
|
||||
$cwd = (Get-Location).Path
|
||||
if ($planDir -eq $cwd) {
|
||||
if (Test-SlugPlanDirectory $cwd) {
|
||||
return (Join-Path $cwd ".attestation")
|
||||
}
|
||||
return (Join-Path $cwd ".plan-attestation")
|
||||
}
|
||||
return (Join-Path $planDir ".attestation")
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
# 1. $PLAN_ID env var → ./.planning/$PLAN_ID/
|
||||
# 2. ./.planning/.active_plan
|
||||
# 3. Newest ./.planning/<dir>/ by mtime
|
||||
# 4. Legacy ./task_plan.md at project root
|
||||
# 4. Current directory when it is .planning/<valid-slug>/
|
||||
# 5. Legacy ./task_plan.md at project root
|
||||
#
|
||||
# Usage:
|
||||
# sh scripts/attest-plan.sh # attest the active plan
|
||||
@@ -21,6 +22,25 @@ set -u
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
RESOLVER="${SCRIPT_DIR}/resolve-plan-dir.sh"
|
||||
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
resolve_from_slug_cwd() {
|
||||
slug_cwd="$(pwd -P 2>/dev/null)" || return 1
|
||||
planning_dir="${slug_cwd%/*}"
|
||||
[ "${planning_dir##*/}" = ".planning" ] || return 1
|
||||
plan_id="${slug_cwd##*/}"
|
||||
slug_is_valid "${plan_id}" || return 1
|
||||
[ -f "${slug_cwd}/task_plan.md" ] || return 1
|
||||
printf "%s\n" "${slug_cwd}/task_plan.md"
|
||||
}
|
||||
|
||||
resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
@@ -30,6 +50,22 @@ resolve_plan_file() {
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Explicit selectors are bindings, not hints. If the shared resolver
|
||||
# rejected one, do not attest a different plan through a cwd fallback.
|
||||
if [ -n "${PWF_PLAN_ROOT:-}" ] || [ -n "${PLAN_ID:-}" ]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
# An absolute script path does not change the invoking shell's cwd. When
|
||||
# that cwd is a slug plan directory, keep slug-mode storage semantics
|
||||
# instead of misclassifying its task_plan.md as a legacy root plan.
|
||||
slug_plan_file="$(resolve_from_slug_cwd)" || slug_plan_file=""
|
||||
if [ -n "${slug_plan_file}" ]; then
|
||||
printf "%s\n" "${slug_plan_file}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "./task_plan.md" ]; then
|
||||
printf "%s\n" "./task_plan.md"
|
||||
return 0
|
||||
|
||||
@@ -140,14 +140,17 @@ if ($env:PLAN_ID) {
|
||||
}
|
||||
}
|
||||
|
||||
if (Test-Path -LiteralPath $activeFile) {
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not $activeItem.PSIsContainer -and
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) {
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
} else {
|
||||
$planId = $null
|
||||
# Get-Item observes the link object even when its target is missing, unlike
|
||||
# Test-Path which follows the target. An active pointer that is a directory or
|
||||
# reparse point is an unsafe/ambiguous selector and must terminate resolution;
|
||||
# falling through would silently select and expose the newest unrelated plan.
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem) {
|
||||
if ($activeItem.PSIsContainer -or
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0)) {
|
||||
exit 0
|
||||
}
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
if ($planId -and (Test-ValidSlug $planId)) {
|
||||
$candidate = Join-Path $PlanRoot $planId
|
||||
if ((Test-Path $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
|
||||
|
||||
@@ -90,10 +90,54 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
@@ -105,12 +149,9 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -180,7 +221,8 @@ is_within_root() {
|
||||
}
|
||||
|
||||
# Portable mtime resolver. Tries GNU stat, BSD stat, BSD/macOS date -r,
|
||||
# python3, then perl. Returns "0" on full miss so callers can sort.
|
||||
# then an explicitly trusted Python interpreter. Returns "0" on a full miss
|
||||
# so newest-plan selection fails closed instead of executing from PATH.
|
||||
mtime_of() {
|
||||
target="$1"
|
||||
out="$(stat -c '%Y' "${target}" 2>/dev/null)"
|
||||
@@ -189,16 +231,9 @@ mtime_of() {
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
out="$(date -r "${target}" +%s 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
out="$(perl -e 'print((stat shift)[9])' "${target}" 2>/dev/null)"
|
||||
_mtime_python="$(trusted_python)" || _mtime_python=""
|
||||
if [ -n "${_mtime_python}" ]; then
|
||||
out="$("${_mtime_python}" -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
printf "0\n"
|
||||
|
||||
@@ -21,6 +21,11 @@ _WALL_CLOCK_UTC = re.compile(rb"T[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]+)?Z")
|
||||
_WALL_CLOCK_OFFSET = re.compile(
|
||||
rb"T[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]+)?([+-][0-9]{2}:[0-9]{2})"
|
||||
)
|
||||
_DARWIN_SYSTEM_ALIASES = {
|
||||
Path("/var"): Path("/private/var"),
|
||||
Path("/tmp"): Path("/private/tmp"),
|
||||
Path("/etc"): Path("/private/etc"),
|
||||
}
|
||||
|
||||
for _stream in (sys.stdout, sys.stderr):
|
||||
_reconfigure = getattr(_stream, "reconfigure", None)
|
||||
@@ -38,13 +43,37 @@ def _is_reparse_or_link_stat(info: os.stat_result) -> bool:
|
||||
return bool(attrs & getattr(stat, "FILE_ATTRIBUTE_REPARSE_POINT", 0x400))
|
||||
|
||||
|
||||
def _is_trusted_darwin_system_alias(path: Path, info: os.stat_result) -> bool:
|
||||
"""Admit only macOS's fixed root aliases after verifying their targets."""
|
||||
if sys.platform != "darwin" or not stat.S_ISLNK(info.st_mode):
|
||||
return False
|
||||
absolute = Path(os.path.abspath(path))
|
||||
expected = _DARWIN_SYSTEM_ALIASES.get(absolute)
|
||||
if expected is None:
|
||||
return False
|
||||
try:
|
||||
link_target = Path(os.readlink(absolute))
|
||||
if not link_target.is_absolute():
|
||||
link_target = absolute.parent / link_target
|
||||
if Path(os.path.normpath(link_target)) != expected:
|
||||
return False
|
||||
if Path(os.path.realpath(absolute)) != expected:
|
||||
return False
|
||||
target_info = expected.lstat()
|
||||
except (OSError, RuntimeError):
|
||||
return False
|
||||
return stat.S_ISDIR(target_info.st_mode) and not _is_reparse_or_link_stat(target_info)
|
||||
|
||||
|
||||
def _assert_no_reparse_components(path: Path) -> Path:
|
||||
absolute = Path(os.path.abspath(path))
|
||||
current = Path(absolute.anchor)
|
||||
for part in absolute.parts[1:]:
|
||||
current /= part
|
||||
info = current.lstat()
|
||||
if _is_reparse_or_link_stat(info):
|
||||
if _is_reparse_or_link_stat(info) and not _is_trusted_darwin_system_alias(
|
||||
current, info
|
||||
):
|
||||
raise ValueError("refusing symlink or reparse-point context path")
|
||||
return absolute
|
||||
|
||||
|
||||
@@ -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.12.0"
|
||||
version: "3.12.1"
|
||||
---
|
||||
|
||||
> Hermes note: lifecycle automation for this skill is provided by the Hermes adapter plugin in `.hermes/plugins/planning-with-files/`.
|
||||
|
||||
@@ -36,7 +36,7 @@ hooks:
|
||||
- type: command
|
||||
command: "SH=\"\"; for c in \"${PWF_SCRIPT_DIR}/inject-plan.sh\" \"${CLAUDE_SKILL_DIR}/scripts/inject-plan.sh\" \"$HOME/.mastracode/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/inject-plan.sh\"; do [ -f \"$c\" ] && { SH=\"$c\"; break; }; done; [ -n \"$SH\" ] && sh \"$SH\" --context=precompact; exit 0"
|
||||
metadata:
|
||||
version: "3.12.0"
|
||||
version: "3.12.1"
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -27,27 +27,26 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Select a working interpreter, not merely the first executable name on PATH.
|
||||
# Validate candidate interpreters supplied by the selector wrappers below.
|
||||
# Windows Store app aliases can exist as python3.exe while refusing every
|
||||
# script invocation. Probe candidates privately and fail closed if none runs.
|
||||
select_python() {
|
||||
# PWF_TRUSTED_PYTHON is the explicit trust path. PYTHON_BIN remains a
|
||||
# compatibility alias. PATH discovery is a deliberate fallback: the hook
|
||||
# treats the caller's PATH as executable trust, but still requires the
|
||||
# resolved candidate to be an absolute regular executable.
|
||||
for _sp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}" "$(command -v python3 2>/dev/null)" "$(command -v python 2>/dev/null)"; do
|
||||
select_python_candidates() {
|
||||
for _sp_candidate in "$@"; do
|
||||
[ -n "$_sp_candidate" ] || continue
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
case "$_sp_candidate" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
# Git Bash cannot reliably test or invoke C:\... spelling.
|
||||
# Convert before every filesystem predicate and invocation.
|
||||
command -v cygpath >/dev/null 2>&1 || continue
|
||||
_sp_candidate="$(cygpath -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
# Convert with Git Bash's fixed system helper, never PATH.
|
||||
_sp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "$_sp_cygpath" ] && [ -x "$_sp_cygpath" ] || continue
|
||||
_sp_candidate="$("$_sp_cygpath" -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
[ -f "$_sp_candidate" ] || continue
|
||||
[ -x "$_sp_candidate" ] || continue
|
||||
if "$_sp_candidate" -c 'import sys; raise SystemExit(0 if sys.version_info >= (3, 8) else 1)' >/dev/null 2>&1; then
|
||||
@@ -58,6 +57,21 @@ select_python() {
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment may use only an interpreter path the caller explicitly trusted.
|
||||
select_explicit_python() {
|
||||
select_python_candidates "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"
|
||||
}
|
||||
|
||||
# After containment succeeds, PATH discovery remains a compatibility fallback
|
||||
# for hosts that do not export an interpreter path to direct hook invocations.
|
||||
select_python() {
|
||||
select_python_candidates \
|
||||
"${PWF_TRUSTED_PYTHON:-}" \
|
||||
"${PYTHON_BIN:-}" \
|
||||
"$(command -v python3 2>/dev/null)" \
|
||||
"$(command -v python 2>/dev/null)"
|
||||
}
|
||||
|
||||
# issue #195: per-invocation opt-out (PLANNING_DISABLED=1) for one-shot/CI
|
||||
# sessions that share a cwd with a plan but never opted into it.
|
||||
[ "${PLANNING_DISABLED:-}" = "1" ] && exit 0
|
||||
@@ -154,13 +168,24 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
# (Copied verbatim from resolve-plan-dir.sh so hook injection gets the same
|
||||
# symlink containment as the resolver — see security A1.3.)
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Matching is case-insensitive and works after slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils), then
|
||||
# readlink -f (older GNU), then the interpreter already validated by
|
||||
# select_python(). Prints the canonical absolute path on success; prints
|
||||
# nothing and returns 1 on a full miss so the caller can decide what to do.
|
||||
# The fallback must not rediscover or execute an unvalidated PATH interpreter.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
@@ -171,12 +196,8 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
if [ -n "${PWF_PYTHON:-}" ]; then
|
||||
out="$("${PWF_PYTHON}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -256,9 +277,9 @@ fi
|
||||
if [ -z "$RESOLVED" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; then RESOLVED="${PLAN_PREFIX}."; SCOPE="root"; fi
|
||||
[ -z "$RESOLVED" ] && exit 0
|
||||
|
||||
# Do not probe or execute any interpreter until a real, contained plan exists.
|
||||
# This keeps opt-out and no-plan hook fires side-effect free even when an
|
||||
# untrusted PYTHON_BIN or PATH entry points at an executable canary.
|
||||
# Do not probe or execute any interpreter until a real plan exists. Before
|
||||
# containment, only an explicit PWF_TRUSTED_PYTHON or PYTHON_BIN may be used.
|
||||
# PATH discovery remains deferred until containment succeeds.
|
||||
if [ "$SCOPE" = "root" ]; then
|
||||
PRECHECK_PLAN_FILE="${PLAN_PREFIX}task_plan.md"
|
||||
else
|
||||
@@ -266,8 +287,9 @@ else
|
||||
fi
|
||||
[ -f "$PRECHECK_PLAN_FILE" ] || exit 0
|
||||
[ -L "$PRECHECK_PLAN_FILE" ] && exit 0
|
||||
PWF_PYTHON="$(select_explicit_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
is_within_root "$PRECHECK_PLAN_FILE" || exit 0
|
||||
PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
[ -n "$PWF_PYTHON" ] || PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
|
||||
# Session attachment is evaluated only after plan existence is proven. A
|
||||
# stale sessions directory without any plan must not cause interpreter probes.
|
||||
|
||||
@@ -90,10 +90,54 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
@@ -105,12 +149,9 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -180,7 +221,8 @@ is_within_root() {
|
||||
}
|
||||
|
||||
# Portable mtime resolver. Tries GNU stat, BSD stat, BSD/macOS date -r,
|
||||
# python3, then perl. Returns "0" on full miss so callers can sort.
|
||||
# then an explicitly trusted Python interpreter. Returns "0" on a full miss
|
||||
# so newest-plan selection fails closed instead of executing from PATH.
|
||||
mtime_of() {
|
||||
target="$1"
|
||||
out="$(stat -c '%Y' "${target}" 2>/dev/null)"
|
||||
@@ -189,16 +231,9 @@ mtime_of() {
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
out="$(date -r "${target}" +%s 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
out="$(perl -e 'print((stat shift)[9])' "${target}" 2>/dev/null)"
|
||||
_mtime_python="$(trusted_python)" || _mtime_python=""
|
||||
if [ -n "${_mtime_python}" ]; then
|
||||
out="$("${_mtime_python}" -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
printf "0\n"
|
||||
|
||||
@@ -36,7 +36,7 @@ hooks:
|
||||
- type: command
|
||||
command: "SH=\"\"; for c in \"${PWF_SCRIPT_DIR}/inject-plan.sh\" \"${CLAUDE_SKILL_DIR}/scripts/inject-plan.sh\" \"$HOME/.config/opencode/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.opencode/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/inject-plan.sh\"; do [ -f \"$c\" ] && { SH=\"$c\"; break; }; done; [ -n \"$SH\" ] && sh \"$SH\" --context=precompact; exit 0"
|
||||
metadata:
|
||||
version: "3.12.0"
|
||||
version: "3.12.1"
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -27,27 +27,26 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Select a working interpreter, not merely the first executable name on PATH.
|
||||
# Validate candidate interpreters supplied by the selector wrappers below.
|
||||
# Windows Store app aliases can exist as python3.exe while refusing every
|
||||
# script invocation. Probe candidates privately and fail closed if none runs.
|
||||
select_python() {
|
||||
# PWF_TRUSTED_PYTHON is the explicit trust path. PYTHON_BIN remains a
|
||||
# compatibility alias. PATH discovery is a deliberate fallback: the hook
|
||||
# treats the caller's PATH as executable trust, but still requires the
|
||||
# resolved candidate to be an absolute regular executable.
|
||||
for _sp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}" "$(command -v python3 2>/dev/null)" "$(command -v python 2>/dev/null)"; do
|
||||
select_python_candidates() {
|
||||
for _sp_candidate in "$@"; do
|
||||
[ -n "$_sp_candidate" ] || continue
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
case "$_sp_candidate" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
# Git Bash cannot reliably test or invoke C:\... spelling.
|
||||
# Convert before every filesystem predicate and invocation.
|
||||
command -v cygpath >/dev/null 2>&1 || continue
|
||||
_sp_candidate="$(cygpath -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
# Convert with Git Bash's fixed system helper, never PATH.
|
||||
_sp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "$_sp_cygpath" ] && [ -x "$_sp_cygpath" ] || continue
|
||||
_sp_candidate="$("$_sp_cygpath" -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
[ -f "$_sp_candidate" ] || continue
|
||||
[ -x "$_sp_candidate" ] || continue
|
||||
if "$_sp_candidate" -c 'import sys; raise SystemExit(0 if sys.version_info >= (3, 8) else 1)' >/dev/null 2>&1; then
|
||||
@@ -58,6 +57,21 @@ select_python() {
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment may use only an interpreter path the caller explicitly trusted.
|
||||
select_explicit_python() {
|
||||
select_python_candidates "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"
|
||||
}
|
||||
|
||||
# After containment succeeds, PATH discovery remains a compatibility fallback
|
||||
# for hosts that do not export an interpreter path to direct hook invocations.
|
||||
select_python() {
|
||||
select_python_candidates \
|
||||
"${PWF_TRUSTED_PYTHON:-}" \
|
||||
"${PYTHON_BIN:-}" \
|
||||
"$(command -v python3 2>/dev/null)" \
|
||||
"$(command -v python 2>/dev/null)"
|
||||
}
|
||||
|
||||
# issue #195: per-invocation opt-out (PLANNING_DISABLED=1) for one-shot/CI
|
||||
# sessions that share a cwd with a plan but never opted into it.
|
||||
[ "${PLANNING_DISABLED:-}" = "1" ] && exit 0
|
||||
@@ -154,13 +168,24 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
# (Copied verbatim from resolve-plan-dir.sh so hook injection gets the same
|
||||
# symlink containment as the resolver — see security A1.3.)
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Matching is case-insensitive and works after slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils), then
|
||||
# readlink -f (older GNU), then the interpreter already validated by
|
||||
# select_python(). Prints the canonical absolute path on success; prints
|
||||
# nothing and returns 1 on a full miss so the caller can decide what to do.
|
||||
# The fallback must not rediscover or execute an unvalidated PATH interpreter.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
@@ -171,12 +196,8 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
if [ -n "${PWF_PYTHON:-}" ]; then
|
||||
out="$("${PWF_PYTHON}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -256,9 +277,9 @@ fi
|
||||
if [ -z "$RESOLVED" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; then RESOLVED="${PLAN_PREFIX}."; SCOPE="root"; fi
|
||||
[ -z "$RESOLVED" ] && exit 0
|
||||
|
||||
# Do not probe or execute any interpreter until a real, contained plan exists.
|
||||
# This keeps opt-out and no-plan hook fires side-effect free even when an
|
||||
# untrusted PYTHON_BIN or PATH entry points at an executable canary.
|
||||
# Do not probe or execute any interpreter until a real plan exists. Before
|
||||
# containment, only an explicit PWF_TRUSTED_PYTHON or PYTHON_BIN may be used.
|
||||
# PATH discovery remains deferred until containment succeeds.
|
||||
if [ "$SCOPE" = "root" ]; then
|
||||
PRECHECK_PLAN_FILE="${PLAN_PREFIX}task_plan.md"
|
||||
else
|
||||
@@ -266,8 +287,9 @@ else
|
||||
fi
|
||||
[ -f "$PRECHECK_PLAN_FILE" ] || exit 0
|
||||
[ -L "$PRECHECK_PLAN_FILE" ] && exit 0
|
||||
PWF_PYTHON="$(select_explicit_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
is_within_root "$PRECHECK_PLAN_FILE" || exit 0
|
||||
PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
[ -n "$PWF_PYTHON" ] || PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
|
||||
# Session attachment is evaluated only after plan existence is proven. A
|
||||
# stale sessions directory without any plan must not cause interpreter probes.
|
||||
|
||||
@@ -90,10 +90,54 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
@@ -105,12 +149,9 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -180,7 +221,8 @@ is_within_root() {
|
||||
}
|
||||
|
||||
# Portable mtime resolver. Tries GNU stat, BSD stat, BSD/macOS date -r,
|
||||
# python3, then perl. Returns "0" on full miss so callers can sort.
|
||||
# then an explicitly trusted Python interpreter. Returns "0" on a full miss
|
||||
# so newest-plan selection fails closed instead of executing from PATH.
|
||||
mtime_of() {
|
||||
target="$1"
|
||||
out="$(stat -c '%Y' "${target}" 2>/dev/null)"
|
||||
@@ -189,16 +231,9 @@ mtime_of() {
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
out="$(date -r "${target}" +%s 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
out="$(perl -e 'print((stat shift)[9])' "${target}" 2>/dev/null)"
|
||||
_mtime_python="$(trusted_python)" || _mtime_python=""
|
||||
if [ -n "${_mtime_python}" ]; then
|
||||
out="$("${_mtime_python}" -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
printf "0\n"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "planning-with-files",
|
||||
"version": "3.12.0",
|
||||
"version": "3.12.1",
|
||||
"description": "Persistent project planning with selected context injection. Automatic recovery uses project files only; explicit catchup modes read same-project local session records for aggregate counts or bounded replay. The host-aware gate never runs Markdown-declared commands. No network upload path. Ships the skill plus a Pi Coding Agent extension.",
|
||||
"keywords": [
|
||||
"pi-package",
|
||||
|
||||
@@ -32,6 +32,9 @@ param(
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
if (-not $script:IsWindowsHost) {
|
||||
throw "Safe no-follow descriptor operations are unavailable in this PowerShell script on Unix. Use scripts/attest-plan.sh instead."
|
||||
}
|
||||
if ($script:IsWindowsHost -and -not ("PwfAttestationNative" -as [type])) {
|
||||
Add-Type -TypeDefinition @'
|
||||
using System;
|
||||
@@ -382,6 +385,21 @@ function Resolve-ContainedPlanFile {
|
||||
} catch { return $null }
|
||||
}
|
||||
|
||||
function Test-SlugPlanDirectory {
|
||||
param([string] $Directory)
|
||||
try {
|
||||
$finalDirectory = [PwfAttestationNative]::FinalDirectoryPath($Directory)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
$planningDirectory = Split-Path -Parent $finalDirectory
|
||||
$planId = Split-Path -Leaf $finalDirectory
|
||||
return (
|
||||
(Split-Path -Leaf $planningDirectory) -eq ".planning" -and
|
||||
$planId -match '^[A-Za-z0-9_][A-Za-z0-9._-]*$'
|
||||
)
|
||||
}
|
||||
|
||||
function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
@@ -395,10 +413,17 @@ function Resolve-PlanFile {
|
||||
# fall through and attest an unrelated legacy-root plan.
|
||||
if ($env:PWF_PLAN_ROOT -or $env:PLAN_ID) { return $null }
|
||||
$activePointer = Join-Path (Join-Path (Get-Location) ".planning") ".active_plan"
|
||||
if (Test-Path -LiteralPath $activePointer) { return $null }
|
||||
$activePointerItem = Get-Item -LiteralPath $activePointer -Force -ErrorAction SilentlyContinue
|
||||
if ($activePointerItem) { return $null }
|
||||
|
||||
$legacy = Join-Path (Get-Location) "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory (Get-Location).Path)
|
||||
$currentDirectory = (Get-Location).Path
|
||||
if (Test-SlugPlanDirectory $currentDirectory) {
|
||||
$slugPlan = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $slugPlan -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
$legacy = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
function Get-AttestationPath {
|
||||
@@ -406,6 +431,9 @@ function Get-AttestationPath {
|
||||
$planDir = Split-Path -Parent $PlanFile
|
||||
$cwd = (Get-Location).Path
|
||||
if ($planDir -eq $cwd) {
|
||||
if (Test-SlugPlanDirectory $cwd) {
|
||||
return (Join-Path $cwd ".attestation")
|
||||
}
|
||||
return (Join-Path $cwd ".plan-attestation")
|
||||
}
|
||||
return (Join-Path $planDir ".attestation")
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
# 1. $PLAN_ID env var → ./.planning/$PLAN_ID/
|
||||
# 2. ./.planning/.active_plan
|
||||
# 3. Newest ./.planning/<dir>/ by mtime
|
||||
# 4. Legacy ./task_plan.md at project root
|
||||
# 4. Current directory when it is .planning/<valid-slug>/
|
||||
# 5. Legacy ./task_plan.md at project root
|
||||
#
|
||||
# Usage:
|
||||
# sh scripts/attest-plan.sh # attest the active plan
|
||||
@@ -21,6 +22,25 @@ set -u
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
RESOLVER="${SCRIPT_DIR}/resolve-plan-dir.sh"
|
||||
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
resolve_from_slug_cwd() {
|
||||
slug_cwd="$(pwd -P 2>/dev/null)" || return 1
|
||||
planning_dir="${slug_cwd%/*}"
|
||||
[ "${planning_dir##*/}" = ".planning" ] || return 1
|
||||
plan_id="${slug_cwd##*/}"
|
||||
slug_is_valid "${plan_id}" || return 1
|
||||
[ -f "${slug_cwd}/task_plan.md" ] || return 1
|
||||
printf "%s\n" "${slug_cwd}/task_plan.md"
|
||||
}
|
||||
|
||||
resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
@@ -30,6 +50,22 @@ resolve_plan_file() {
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Explicit selectors are bindings, not hints. If the shared resolver
|
||||
# rejected one, do not attest a different plan through a cwd fallback.
|
||||
if [ -n "${PWF_PLAN_ROOT:-}" ] || [ -n "${PLAN_ID:-}" ]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
# An absolute script path does not change the invoking shell's cwd. When
|
||||
# that cwd is a slug plan directory, keep slug-mode storage semantics
|
||||
# instead of misclassifying its task_plan.md as a legacy root plan.
|
||||
slug_plan_file="$(resolve_from_slug_cwd)" || slug_plan_file=""
|
||||
if [ -n "${slug_plan_file}" ]; then
|
||||
printf "%s\n" "${slug_plan_file}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "./task_plan.md" ]; then
|
||||
printf "%s\n" "./task_plan.md"
|
||||
return 0
|
||||
|
||||
@@ -27,27 +27,26 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Select a working interpreter, not merely the first executable name on PATH.
|
||||
# Validate candidate interpreters supplied by the selector wrappers below.
|
||||
# Windows Store app aliases can exist as python3.exe while refusing every
|
||||
# script invocation. Probe candidates privately and fail closed if none runs.
|
||||
select_python() {
|
||||
# PWF_TRUSTED_PYTHON is the explicit trust path. PYTHON_BIN remains a
|
||||
# compatibility alias. PATH discovery is a deliberate fallback: the hook
|
||||
# treats the caller's PATH as executable trust, but still requires the
|
||||
# resolved candidate to be an absolute regular executable.
|
||||
for _sp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}" "$(command -v python3 2>/dev/null)" "$(command -v python 2>/dev/null)"; do
|
||||
select_python_candidates() {
|
||||
for _sp_candidate in "$@"; do
|
||||
[ -n "$_sp_candidate" ] || continue
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
case "$_sp_candidate" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
# Git Bash cannot reliably test or invoke C:\... spelling.
|
||||
# Convert before every filesystem predicate and invocation.
|
||||
command -v cygpath >/dev/null 2>&1 || continue
|
||||
_sp_candidate="$(cygpath -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
# Convert with Git Bash's fixed system helper, never PATH.
|
||||
_sp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "$_sp_cygpath" ] && [ -x "$_sp_cygpath" ] || continue
|
||||
_sp_candidate="$("$_sp_cygpath" -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
[ -f "$_sp_candidate" ] || continue
|
||||
[ -x "$_sp_candidate" ] || continue
|
||||
if "$_sp_candidate" -c 'import sys; raise SystemExit(0 if sys.version_info >= (3, 8) else 1)' >/dev/null 2>&1; then
|
||||
@@ -58,6 +57,21 @@ select_python() {
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment may use only an interpreter path the caller explicitly trusted.
|
||||
select_explicit_python() {
|
||||
select_python_candidates "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"
|
||||
}
|
||||
|
||||
# After containment succeeds, PATH discovery remains a compatibility fallback
|
||||
# for hosts that do not export an interpreter path to direct hook invocations.
|
||||
select_python() {
|
||||
select_python_candidates \
|
||||
"${PWF_TRUSTED_PYTHON:-}" \
|
||||
"${PYTHON_BIN:-}" \
|
||||
"$(command -v python3 2>/dev/null)" \
|
||||
"$(command -v python 2>/dev/null)"
|
||||
}
|
||||
|
||||
# issue #195: per-invocation opt-out (PLANNING_DISABLED=1) for one-shot/CI
|
||||
# sessions that share a cwd with a plan but never opted into it.
|
||||
[ "${PLANNING_DISABLED:-}" = "1" ] && exit 0
|
||||
@@ -154,13 +168,24 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
# (Copied verbatim from resolve-plan-dir.sh so hook injection gets the same
|
||||
# symlink containment as the resolver — see security A1.3.)
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Matching is case-insensitive and works after slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils), then
|
||||
# readlink -f (older GNU), then the interpreter already validated by
|
||||
# select_python(). Prints the canonical absolute path on success; prints
|
||||
# nothing and returns 1 on a full miss so the caller can decide what to do.
|
||||
# The fallback must not rediscover or execute an unvalidated PATH interpreter.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
@@ -171,12 +196,8 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
if [ -n "${PWF_PYTHON:-}" ]; then
|
||||
out="$("${PWF_PYTHON}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -256,9 +277,9 @@ fi
|
||||
if [ -z "$RESOLVED" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; then RESOLVED="${PLAN_PREFIX}."; SCOPE="root"; fi
|
||||
[ -z "$RESOLVED" ] && exit 0
|
||||
|
||||
# Do not probe or execute any interpreter until a real, contained plan exists.
|
||||
# This keeps opt-out and no-plan hook fires side-effect free even when an
|
||||
# untrusted PYTHON_BIN or PATH entry points at an executable canary.
|
||||
# Do not probe or execute any interpreter until a real plan exists. Before
|
||||
# containment, only an explicit PWF_TRUSTED_PYTHON or PYTHON_BIN may be used.
|
||||
# PATH discovery remains deferred until containment succeeds.
|
||||
if [ "$SCOPE" = "root" ]; then
|
||||
PRECHECK_PLAN_FILE="${PLAN_PREFIX}task_plan.md"
|
||||
else
|
||||
@@ -266,8 +287,9 @@ else
|
||||
fi
|
||||
[ -f "$PRECHECK_PLAN_FILE" ] || exit 0
|
||||
[ -L "$PRECHECK_PLAN_FILE" ] && exit 0
|
||||
PWF_PYTHON="$(select_explicit_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
is_within_root "$PRECHECK_PLAN_FILE" || exit 0
|
||||
PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
[ -n "$PWF_PYTHON" ] || PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
|
||||
# Session attachment is evaluated only after plan existence is proven. A
|
||||
# stale sessions directory without any plan must not cause interpreter probes.
|
||||
|
||||
@@ -140,14 +140,17 @@ if ($env:PLAN_ID) {
|
||||
}
|
||||
}
|
||||
|
||||
if (Test-Path -LiteralPath $activeFile) {
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not $activeItem.PSIsContainer -and
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) {
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
} else {
|
||||
$planId = $null
|
||||
# Get-Item observes the link object even when its target is missing, unlike
|
||||
# Test-Path which follows the target. An active pointer that is a directory or
|
||||
# reparse point is an unsafe/ambiguous selector and must terminate resolution;
|
||||
# falling through would silently select and expose the newest unrelated plan.
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem) {
|
||||
if ($activeItem.PSIsContainer -or
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0)) {
|
||||
exit 0
|
||||
}
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
if ($planId -and (Test-ValidSlug $planId)) {
|
||||
$candidate = Join-Path $PlanRoot $planId
|
||||
if ((Test-Path $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
|
||||
|
||||
@@ -90,10 +90,54 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
@@ -105,12 +149,9 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -180,7 +221,8 @@ is_within_root() {
|
||||
}
|
||||
|
||||
# Portable mtime resolver. Tries GNU stat, BSD stat, BSD/macOS date -r,
|
||||
# python3, then perl. Returns "0" on full miss so callers can sort.
|
||||
# then an explicitly trusted Python interpreter. Returns "0" on a full miss
|
||||
# so newest-plan selection fails closed instead of executing from PATH.
|
||||
mtime_of() {
|
||||
target="$1"
|
||||
out="$(stat -c '%Y' "${target}" 2>/dev/null)"
|
||||
@@ -189,16 +231,9 @@ mtime_of() {
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
out="$(date -r "${target}" +%s 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
out="$(perl -e 'print((stat shift)[9])' "${target}" 2>/dev/null)"
|
||||
_mtime_python="$(trusted_python)" || _mtime_python=""
|
||||
if [ -n "${_mtime_python}" ]; then
|
||||
out="$("${_mtime_python}" -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
printf "0\n"
|
||||
|
||||
@@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
## [3.12.1] - 2026-08-31
|
||||
|
||||
### Fixed
|
||||
- **Running an attestation helper from inside `.planning/<slug>/` wrote a legacy `.plan-attestation` file and left the slug's real `.attestation` stale (fixes #234, reported by @sortakool).** The shell and PowerShell helpers now recognize a valid direct slug directory, update its `.attestation`, and preserve the same target for show and clear operations. An explicit `PLAN_ID` or `PWF_PLAN_ROOT` that does not resolve now stops without attesting another local plan through the current-directory fallback.
|
||||
- **Cross-platform hook and resolver checks failed on macOS and Windows.** The Codex and Hermes context readers now admit only verified macOS system aliases (`/var`, `/tmp`, and `/etc`) to their fixed `/private/...` targets, while other links remain rejected. The PowerShell attester now refuses to run on Unix where its safe no-follow operation is unavailable, and malformed or dangling `.planning/.active_plan` entries stop resolution instead of selecting a legacy plan. When native canonicalization tools are unavailable, the shell resolver now uses only an explicitly trusted absolute Python path instead of selecting Python or Perl from `PATH`. The injector's containment fallback now accepts only an explicitly supplied, validated interpreter and defers PATH discovery until containment succeeds, so a BSD environment that supplies only `PWF_TRUSTED_PYTHON` does not silently suppress plan context.
|
||||
|
||||
### Verification
|
||||
- The v3.12.0 failure was reproduced from both invocation locations: the first call from the project root created the slug attestation, while the second call from inside the slug directory exited successfully, created the legacy file, and left the real attestation stale.
|
||||
- The clean issue regression and mirror-sync suite passed with 24 tests, 5 platform skips, and 13 subtests. Focused resolver, containment, hook integration, command contract, and line-ending suites passed with 74 tests and 6 platform skips.
|
||||
- All 15 maintained shell copies passed syntax checks, and the 15 shell copies and 15 PowerShell copies are byte-identical within their respective sets.
|
||||
- The exact detached v3.12.1 candidate passed the complete Python 3.12 suite with 598 tests, 29 platform skips, and 785 subtests.
|
||||
- After the first remote matrix exposed a BSD-harness injection mismatch, the corrected full flow passed all 3 BSD-userland tests in a Linux container with Python absent from `PATH`.
|
||||
- The final post-correction Python 3.12 candidate passed the complete suite with 598 tests, 31 platform skips, and 785 subtests in 2732.99 seconds.
|
||||
|
||||
### Thanks
|
||||
- Raymond Manaloto (@sortakool) supplied a minimal reproduction, identified the split between the resolver and attestation path, and explained why the next root invocation reports a false tamper event in issue #234.
|
||||
|
||||
## [3.12.0] - 2026-08-30
|
||||
|
||||
### Security
|
||||
|
||||
+2
-2
@@ -7,8 +7,8 @@ authors:
|
||||
- family-names: Adi
|
||||
given-names: Ahmad Othman Ammar
|
||||
alias: OthmanAdi
|
||||
version: "3.12.0"
|
||||
date-released: "2026-08-30"
|
||||
version: "3.12.1"
|
||||
date-released: "2026-08-31"
|
||||
license: MIT
|
||||
url: "https://github.com/OthmanAdi/planning-with-files"
|
||||
repository-code: "https://github.com/OthmanAdi/planning-with-files"
|
||||
|
||||
+6
-2
@@ -106,6 +106,10 @@ These amazing people have contributed code, documentation, or significant improv
|
||||
|
||||
### Other Contributors
|
||||
|
||||
- **[Raymond Manaloto](https://github.com/sortakool)** - [Issue #234](https://github.com/OthmanAdi/planning-with-files/issues/234)
|
||||
- Reproduced the nested attestation failure and traced it to the fallback from slug mode to legacy mode when the helper runs inside `.planning/<slug>/`
|
||||
- **Impact:** The shell and PowerShell helpers now update the slug's `.attestation` from either the project root or the slug directory, so the next root injection does not report a false tamper event
|
||||
|
||||
- **[@lowmiaq-gmail](https://github.com/lowmiaq-gmail)** - [PR #233](https://github.com/OthmanAdi/planning-with-files/pull/233) / [Issue #232](https://github.com/OthmanAdi/planning-with-files/issues/232)
|
||||
- Reported that direct help flags were parsed as project names, then supplied a focused POSIX-shell fix and regression covering both `-h` and `--help` against an empty working directory
|
||||
- **Impact:** Direct help queries print usage and return successfully without creating planning files or replacing `.planning/.active_plan`
|
||||
@@ -407,6 +411,6 @@ If you've contributed and don't see your name here, please open an issue! We wan
|
||||
|
||||
---
|
||||
|
||||
**Total Contributors:** 55+ and growing!
|
||||
**Total Contributors:** 56+ and growing!
|
||||
|
||||
*Last updated: August 29, 2026*
|
||||
*Last updated: August 31, 2026*
|
||||
|
||||
@@ -551,6 +551,7 @@ One hook fire measures 289ms wall-clock since the v3.6.0 optimization, down from
|
||||
|
||||
| Version | Highlights |
|
||||
|---------|------------|
|
||||
| **v3.12.1** | **Attestation now stays in slug mode when the helper runs inside `.planning/<slug>/`** (fixes #234, reported by @sortakool). The shell and PowerShell helpers update the slug's `.attestation` instead of creating a legacy `.plan-attestation`, and invalid explicit selectors stop without falling back to another local plan. PowerShell regression coverage exercises attest, show, and clear from the nested directory. The release also restores macOS system-alias handling for the Codex and Hermes context readers and keeps unsafe active-plan pointers from falling back to an unrelated legacy plan. |
|
||||
| **v3.12.0** | **Session recovery is now consent-bound and the published planning surface is fully auditable.** Automatic hooks read project planning files only. Same-project session metadata and bounded replay require explicit CLI modes, cross-project records remain quarantined, and phase-status writers fail closed when their shared lock is unavailable. Hidden template instructions were replaced with visible guidance, capability descriptions now disclose actual context and gate behavior, and the complete 29-file ClawHub stage is rebuilt and verified from canonical tracked source. |
|
||||
| **v3.11.2** | **Skills-only manual installs now copy one skill at the documented depth** (PR #229 by @dylanpulver). The Unix and PowerShell commands name `skills/planning-with-files` instead of copying `skills/*`, so the `skills/i18n/` subtree no longer lands below the loader path. Both instructions create `~/.claude/skills` first, which keeps a fresh install from placing `SKILL.md` directly under `skills/`. A tracked-Markdown test rejects the old whole-directory copy shape and locks the destination-creation step. |
|
||||
| **v3.11.1** | **The Copilot error hook could not be parsed by a POSIX shell** (PR #228 by @dylanpulver). `error-occurred.sh` fed its two Python helpers with `<<<`, a bash here-string that dash does not implement, and the suite invokes the shell hooks as `sh script`, so the `#!/bin/bash` shebang never applied. On ubuntu runners the file died at line 32 with `Syntax error: redirection unexpected`, and master CI had failed on that leg for five consecutive runs. Both call sites now pipe with `printf '%s\n'`. The sibling `echo` form was deliberately not copied: dash expands backslash escapes, which would have traded a loud syntax error for silent JSON corruption. No user was affected, because Copilot invokes the hook under a `bash` key that bypasses the shebang. |
|
||||
|
||||
@@ -7,11 +7,13 @@ allowed-tools: "Bash"
|
||||
Run the plan attestation helper for the active plan.
|
||||
|
||||
Steps:
|
||||
1. Resolve the active plan: prefer `${PLAN_ID}` env var, then `.planning/.active_plan`, then newest `.planning/<dir>/`, then legacy `./task_plan.md`.
|
||||
1. Resolve the active plan: prefer `${PLAN_ID}` env var, then `.planning/.active_plan`, then newest `.planning/<dir>/`. If the current directory is itself a valid `.planning/<slug>/` directory, use its `task_plan.md`. Otherwise use legacy `./task_plan.md`.
|
||||
2. Compute the SHA-256 of the resolved `task_plan.md`.
|
||||
3. Write the hex digest to `.planning/<active-plan>/.attestation` (parallel-plan mode) or `./.plan-attestation` (legacy mode).
|
||||
4. Confirm to the user with the short hash (first 12 hex chars) and the storage path.
|
||||
|
||||
An explicit `${PLAN_ID}` or `${PWF_PLAN_ROOT}` that does not resolve exits with an error. It never falls back to another plan.
|
||||
|
||||
Implementation:
|
||||
- On Linux/macOS/Git Bash: `sh ${CLAUDE_PLUGIN_ROOT}/scripts/attest-plan.sh`
|
||||
- On Windows PowerShell plugin installs: `& "$env:CLAUDE_PLUGIN_ROOT\scripts\attest-plan.ps1"`
|
||||
|
||||
@@ -14,6 +14,15 @@ When you run `sh scripts/attest-plan.sh`, the script:
|
||||
4. Renames the temporary file into place.
|
||||
5. Uses `flock -w 5` around the rename when `flock` is available.
|
||||
|
||||
The shell and PowerShell helpers can run from the project root or directly from
|
||||
a valid `.planning/<slug>/` directory. A direct slug-directory invocation
|
||||
targets that directory's `task_plan.md` and stores the hash in its `.attestation`
|
||||
file. It does not create the legacy `.plan-attestation` file beside a slug plan.
|
||||
|
||||
`PLAN_ID` and `PWF_PLAN_ROOT` are explicit selectors. If an explicit selector
|
||||
does not resolve, the helper exits with an error instead of attesting a different
|
||||
plan through the current-directory fallback.
|
||||
|
||||
The atomic rename is the correctness guarantee. It prevents readers from seeing
|
||||
a partially written attestation file. The `flock` call is only a cooperative
|
||||
gate for concurrent writers on systems that provide it.
|
||||
|
||||
+31
-3
@@ -32,6 +32,9 @@ param(
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
if (-not $script:IsWindowsHost) {
|
||||
throw "Safe no-follow descriptor operations are unavailable in this PowerShell script on Unix. Use scripts/attest-plan.sh instead."
|
||||
}
|
||||
if ($script:IsWindowsHost -and -not ("PwfAttestationNative" -as [type])) {
|
||||
Add-Type -TypeDefinition @'
|
||||
using System;
|
||||
@@ -382,6 +385,21 @@ function Resolve-ContainedPlanFile {
|
||||
} catch { return $null }
|
||||
}
|
||||
|
||||
function Test-SlugPlanDirectory {
|
||||
param([string] $Directory)
|
||||
try {
|
||||
$finalDirectory = [PwfAttestationNative]::FinalDirectoryPath($Directory)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
$planningDirectory = Split-Path -Parent $finalDirectory
|
||||
$planId = Split-Path -Leaf $finalDirectory
|
||||
return (
|
||||
(Split-Path -Leaf $planningDirectory) -eq ".planning" -and
|
||||
$planId -match '^[A-Za-z0-9_][A-Za-z0-9._-]*$'
|
||||
)
|
||||
}
|
||||
|
||||
function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
@@ -395,10 +413,17 @@ function Resolve-PlanFile {
|
||||
# fall through and attest an unrelated legacy-root plan.
|
||||
if ($env:PWF_PLAN_ROOT -or $env:PLAN_ID) { return $null }
|
||||
$activePointer = Join-Path (Join-Path (Get-Location) ".planning") ".active_plan"
|
||||
if (Test-Path -LiteralPath $activePointer) { return $null }
|
||||
$activePointerItem = Get-Item -LiteralPath $activePointer -Force -ErrorAction SilentlyContinue
|
||||
if ($activePointerItem) { return $null }
|
||||
|
||||
$legacy = Join-Path (Get-Location) "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory (Get-Location).Path)
|
||||
$currentDirectory = (Get-Location).Path
|
||||
if (Test-SlugPlanDirectory $currentDirectory) {
|
||||
$slugPlan = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $slugPlan -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
$legacy = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
function Get-AttestationPath {
|
||||
@@ -406,6 +431,9 @@ function Get-AttestationPath {
|
||||
$planDir = Split-Path -Parent $PlanFile
|
||||
$cwd = (Get-Location).Path
|
||||
if ($planDir -eq $cwd) {
|
||||
if (Test-SlugPlanDirectory $cwd) {
|
||||
return (Join-Path $cwd ".attestation")
|
||||
}
|
||||
return (Join-Path $cwd ".plan-attestation")
|
||||
}
|
||||
return (Join-Path $planDir ".attestation")
|
||||
|
||||
+37
-1
@@ -9,7 +9,8 @@
|
||||
# 1. $PLAN_ID env var → ./.planning/$PLAN_ID/
|
||||
# 2. ./.planning/.active_plan
|
||||
# 3. Newest ./.planning/<dir>/ by mtime
|
||||
# 4. Legacy ./task_plan.md at project root
|
||||
# 4. Current directory when it is .planning/<valid-slug>/
|
||||
# 5. Legacy ./task_plan.md at project root
|
||||
#
|
||||
# Usage:
|
||||
# sh scripts/attest-plan.sh # attest the active plan
|
||||
@@ -21,6 +22,25 @@ set -u
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
RESOLVER="${SCRIPT_DIR}/resolve-plan-dir.sh"
|
||||
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
resolve_from_slug_cwd() {
|
||||
slug_cwd="$(pwd -P 2>/dev/null)" || return 1
|
||||
planning_dir="${slug_cwd%/*}"
|
||||
[ "${planning_dir##*/}" = ".planning" ] || return 1
|
||||
plan_id="${slug_cwd##*/}"
|
||||
slug_is_valid "${plan_id}" || return 1
|
||||
[ -f "${slug_cwd}/task_plan.md" ] || return 1
|
||||
printf "%s\n" "${slug_cwd}/task_plan.md"
|
||||
}
|
||||
|
||||
resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
@@ -30,6 +50,22 @@ resolve_plan_file() {
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Explicit selectors are bindings, not hints. If the shared resolver
|
||||
# rejected one, do not attest a different plan through a cwd fallback.
|
||||
if [ -n "${PWF_PLAN_ROOT:-}" ] || [ -n "${PLAN_ID:-}" ]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
# An absolute script path does not change the invoking shell's cwd. When
|
||||
# that cwd is a slug plan directory, keep slug-mode storage semantics
|
||||
# instead of misclassifying its task_plan.md as a legacy root plan.
|
||||
slug_plan_file="$(resolve_from_slug_cwd)" || slug_plan_file=""
|
||||
if [ -n "${slug_plan_file}" ]; then
|
||||
printf "%s\n" "${slug_plan_file}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "./task_plan.md" ]; then
|
||||
printf "%s\n" "./task_plan.md"
|
||||
return 0
|
||||
|
||||
+49
-27
@@ -27,27 +27,26 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Select a working interpreter, not merely the first executable name on PATH.
|
||||
# Validate candidate interpreters supplied by the selector wrappers below.
|
||||
# Windows Store app aliases can exist as python3.exe while refusing every
|
||||
# script invocation. Probe candidates privately and fail closed if none runs.
|
||||
select_python() {
|
||||
# PWF_TRUSTED_PYTHON is the explicit trust path. PYTHON_BIN remains a
|
||||
# compatibility alias. PATH discovery is a deliberate fallback: the hook
|
||||
# treats the caller's PATH as executable trust, but still requires the
|
||||
# resolved candidate to be an absolute regular executable.
|
||||
for _sp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}" "$(command -v python3 2>/dev/null)" "$(command -v python 2>/dev/null)"; do
|
||||
select_python_candidates() {
|
||||
for _sp_candidate in "$@"; do
|
||||
[ -n "$_sp_candidate" ] || continue
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
case "$_sp_candidate" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
# Git Bash cannot reliably test or invoke C:\... spelling.
|
||||
# Convert before every filesystem predicate and invocation.
|
||||
command -v cygpath >/dev/null 2>&1 || continue
|
||||
_sp_candidate="$(cygpath -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
# Convert with Git Bash's fixed system helper, never PATH.
|
||||
_sp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "$_sp_cygpath" ] && [ -x "$_sp_cygpath" ] || continue
|
||||
_sp_candidate="$("$_sp_cygpath" -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
[ -f "$_sp_candidate" ] || continue
|
||||
[ -x "$_sp_candidate" ] || continue
|
||||
if "$_sp_candidate" -c 'import sys; raise SystemExit(0 if sys.version_info >= (3, 8) else 1)' >/dev/null 2>&1; then
|
||||
@@ -58,6 +57,21 @@ select_python() {
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment may use only an interpreter path the caller explicitly trusted.
|
||||
select_explicit_python() {
|
||||
select_python_candidates "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"
|
||||
}
|
||||
|
||||
# After containment succeeds, PATH discovery remains a compatibility fallback
|
||||
# for hosts that do not export an interpreter path to direct hook invocations.
|
||||
select_python() {
|
||||
select_python_candidates \
|
||||
"${PWF_TRUSTED_PYTHON:-}" \
|
||||
"${PYTHON_BIN:-}" \
|
||||
"$(command -v python3 2>/dev/null)" \
|
||||
"$(command -v python 2>/dev/null)"
|
||||
}
|
||||
|
||||
# issue #195: per-invocation opt-out (PLANNING_DISABLED=1) for one-shot/CI
|
||||
# sessions that share a cwd with a plan but never opted into it.
|
||||
[ "${PLANNING_DISABLED:-}" = "1" ] && exit 0
|
||||
@@ -154,13 +168,24 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
# (Copied verbatim from resolve-plan-dir.sh so hook injection gets the same
|
||||
# symlink containment as the resolver — see security A1.3.)
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Matching is case-insensitive and works after slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils), then
|
||||
# readlink -f (older GNU), then the interpreter already validated by
|
||||
# select_python(). Prints the canonical absolute path on success; prints
|
||||
# nothing and returns 1 on a full miss so the caller can decide what to do.
|
||||
# The fallback must not rediscover or execute an unvalidated PATH interpreter.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
@@ -171,12 +196,8 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
if [ -n "${PWF_PYTHON:-}" ]; then
|
||||
out="$("${PWF_PYTHON}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -256,9 +277,9 @@ fi
|
||||
if [ -z "$RESOLVED" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; then RESOLVED="${PLAN_PREFIX}."; SCOPE="root"; fi
|
||||
[ -z "$RESOLVED" ] && exit 0
|
||||
|
||||
# Do not probe or execute any interpreter until a real, contained plan exists.
|
||||
# This keeps opt-out and no-plan hook fires side-effect free even when an
|
||||
# untrusted PYTHON_BIN or PATH entry points at an executable canary.
|
||||
# Do not probe or execute any interpreter until a real plan exists. Before
|
||||
# containment, only an explicit PWF_TRUSTED_PYTHON or PYTHON_BIN may be used.
|
||||
# PATH discovery remains deferred until containment succeeds.
|
||||
if [ "$SCOPE" = "root" ]; then
|
||||
PRECHECK_PLAN_FILE="${PLAN_PREFIX}task_plan.md"
|
||||
else
|
||||
@@ -266,8 +287,9 @@ else
|
||||
fi
|
||||
[ -f "$PRECHECK_PLAN_FILE" ] || exit 0
|
||||
[ -L "$PRECHECK_PLAN_FILE" ] && exit 0
|
||||
PWF_PYTHON="$(select_explicit_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
is_within_root "$PRECHECK_PLAN_FILE" || exit 0
|
||||
PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
[ -n "$PWF_PYTHON" ] || PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
|
||||
# Session attachment is evaluated only after plan existence is proven. A
|
||||
# stale sessions directory without any plan must not cause interpreter probes.
|
||||
|
||||
@@ -140,14 +140,17 @@ if ($env:PLAN_ID) {
|
||||
}
|
||||
}
|
||||
|
||||
if (Test-Path -LiteralPath $activeFile) {
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not $activeItem.PSIsContainer -and
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) {
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
} else {
|
||||
$planId = $null
|
||||
# Get-Item observes the link object even when its target is missing, unlike
|
||||
# Test-Path which follows the target. An active pointer that is a directory or
|
||||
# reparse point is an unsafe/ambiguous selector and must terminate resolution;
|
||||
# falling through would silently select and expose the newest unrelated plan.
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem) {
|
||||
if ($activeItem.PSIsContainer -or
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0)) {
|
||||
exit 0
|
||||
}
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
if ($planId -and (Test-ValidSlug $planId)) {
|
||||
$candidate = Join-Path $PlanRoot $planId
|
||||
if ((Test-Path $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
|
||||
|
||||
+55
-20
@@ -90,10 +90,54 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
@@ -105,12 +149,9 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -180,7 +221,8 @@ is_within_root() {
|
||||
}
|
||||
|
||||
# Portable mtime resolver. Tries GNU stat, BSD stat, BSD/macOS date -r,
|
||||
# python3, then perl. Returns "0" on full miss so callers can sort.
|
||||
# then an explicitly trusted Python interpreter. Returns "0" on a full miss
|
||||
# so newest-plan selection fails closed instead of executing from PATH.
|
||||
mtime_of() {
|
||||
target="$1"
|
||||
out="$(stat -c '%Y' "${target}" 2>/dev/null)"
|
||||
@@ -189,16 +231,9 @@ mtime_of() {
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
out="$(date -r "${target}" +%s 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
out="$(perl -e 'print((stat shift)[9])' "${target}" 2>/dev/null)"
|
||||
_mtime_python="$(trusted_python)" || _mtime_python=""
|
||||
if [ -n "${_mtime_python}" ]; then
|
||||
out="$("${_mtime_python}" -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
printf "0\n"
|
||||
|
||||
@@ -36,7 +36,7 @@ hooks:
|
||||
- type: command
|
||||
command: "SH=\"\"; for c in \"${PWF_SCRIPT_DIR}/inject-plan.sh\" \"${CLAUDE_SKILL_DIR}/scripts/inject-plan.sh\" \"$HOME/.claude/skills/planning-with-files-ar/scripts/inject-plan.sh\" \"$HOME/.claude/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/inject-plan.sh\"; do [ -f \"$c\" ] && { SH=\"$c\"; break; }; done; [ -n \"$SH\" ] && sh \"$SH\" --context=precompact; exit 0"
|
||||
metadata:
|
||||
version: "3.12.0"
|
||||
version: "3.12.1"
|
||||
---
|
||||
|
||||
# نظام تخطيط الملفات
|
||||
|
||||
@@ -32,6 +32,9 @@ param(
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
if (-not $script:IsWindowsHost) {
|
||||
throw "Safe no-follow descriptor operations are unavailable in this PowerShell script on Unix. Use scripts/attest-plan.sh instead."
|
||||
}
|
||||
if ($script:IsWindowsHost -and -not ("PwfAttestationNative" -as [type])) {
|
||||
Add-Type -TypeDefinition @'
|
||||
using System;
|
||||
@@ -382,6 +385,21 @@ function Resolve-ContainedPlanFile {
|
||||
} catch { return $null }
|
||||
}
|
||||
|
||||
function Test-SlugPlanDirectory {
|
||||
param([string] $Directory)
|
||||
try {
|
||||
$finalDirectory = [PwfAttestationNative]::FinalDirectoryPath($Directory)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
$planningDirectory = Split-Path -Parent $finalDirectory
|
||||
$planId = Split-Path -Leaf $finalDirectory
|
||||
return (
|
||||
(Split-Path -Leaf $planningDirectory) -eq ".planning" -and
|
||||
$planId -match '^[A-Za-z0-9_][A-Za-z0-9._-]*$'
|
||||
)
|
||||
}
|
||||
|
||||
function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
@@ -395,10 +413,17 @@ function Resolve-PlanFile {
|
||||
# fall through and attest an unrelated legacy-root plan.
|
||||
if ($env:PWF_PLAN_ROOT -or $env:PLAN_ID) { return $null }
|
||||
$activePointer = Join-Path (Join-Path (Get-Location) ".planning") ".active_plan"
|
||||
if (Test-Path -LiteralPath $activePointer) { return $null }
|
||||
$activePointerItem = Get-Item -LiteralPath $activePointer -Force -ErrorAction SilentlyContinue
|
||||
if ($activePointerItem) { return $null }
|
||||
|
||||
$legacy = Join-Path (Get-Location) "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory (Get-Location).Path)
|
||||
$currentDirectory = (Get-Location).Path
|
||||
if (Test-SlugPlanDirectory $currentDirectory) {
|
||||
$slugPlan = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $slugPlan -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
$legacy = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
function Get-AttestationPath {
|
||||
@@ -406,6 +431,9 @@ function Get-AttestationPath {
|
||||
$planDir = Split-Path -Parent $PlanFile
|
||||
$cwd = (Get-Location).Path
|
||||
if ($planDir -eq $cwd) {
|
||||
if (Test-SlugPlanDirectory $cwd) {
|
||||
return (Join-Path $cwd ".attestation")
|
||||
}
|
||||
return (Join-Path $cwd ".plan-attestation")
|
||||
}
|
||||
return (Join-Path $planDir ".attestation")
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
# 1. $PLAN_ID env var → ./.planning/$PLAN_ID/
|
||||
# 2. ./.planning/.active_plan
|
||||
# 3. Newest ./.planning/<dir>/ by mtime
|
||||
# 4. Legacy ./task_plan.md at project root
|
||||
# 4. Current directory when it is .planning/<valid-slug>/
|
||||
# 5. Legacy ./task_plan.md at project root
|
||||
#
|
||||
# Usage:
|
||||
# sh scripts/attest-plan.sh # attest the active plan
|
||||
@@ -21,6 +22,25 @@ set -u
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
RESOLVER="${SCRIPT_DIR}/resolve-plan-dir.sh"
|
||||
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
resolve_from_slug_cwd() {
|
||||
slug_cwd="$(pwd -P 2>/dev/null)" || return 1
|
||||
planning_dir="${slug_cwd%/*}"
|
||||
[ "${planning_dir##*/}" = ".planning" ] || return 1
|
||||
plan_id="${slug_cwd##*/}"
|
||||
slug_is_valid "${plan_id}" || return 1
|
||||
[ -f "${slug_cwd}/task_plan.md" ] || return 1
|
||||
printf "%s\n" "${slug_cwd}/task_plan.md"
|
||||
}
|
||||
|
||||
resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
@@ -30,6 +50,22 @@ resolve_plan_file() {
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Explicit selectors are bindings, not hints. If the shared resolver
|
||||
# rejected one, do not attest a different plan through a cwd fallback.
|
||||
if [ -n "${PWF_PLAN_ROOT:-}" ] || [ -n "${PLAN_ID:-}" ]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
# An absolute script path does not change the invoking shell's cwd. When
|
||||
# that cwd is a slug plan directory, keep slug-mode storage semantics
|
||||
# instead of misclassifying its task_plan.md as a legacy root plan.
|
||||
slug_plan_file="$(resolve_from_slug_cwd)" || slug_plan_file=""
|
||||
if [ -n "${slug_plan_file}" ]; then
|
||||
printf "%s\n" "${slug_plan_file}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "./task_plan.md" ]; then
|
||||
printf "%s\n" "./task_plan.md"
|
||||
return 0
|
||||
|
||||
@@ -27,27 +27,26 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Select a working interpreter, not merely the first executable name on PATH.
|
||||
# Validate candidate interpreters supplied by the selector wrappers below.
|
||||
# Windows Store app aliases can exist as python3.exe while refusing every
|
||||
# script invocation. Probe candidates privately and fail closed if none runs.
|
||||
select_python() {
|
||||
# PWF_TRUSTED_PYTHON is the explicit trust path. PYTHON_BIN remains a
|
||||
# compatibility alias. PATH discovery is a deliberate fallback: the hook
|
||||
# treats the caller's PATH as executable trust, but still requires the
|
||||
# resolved candidate to be an absolute regular executable.
|
||||
for _sp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}" "$(command -v python3 2>/dev/null)" "$(command -v python 2>/dev/null)"; do
|
||||
select_python_candidates() {
|
||||
for _sp_candidate in "$@"; do
|
||||
[ -n "$_sp_candidate" ] || continue
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
case "$_sp_candidate" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
# Git Bash cannot reliably test or invoke C:\... spelling.
|
||||
# Convert before every filesystem predicate and invocation.
|
||||
command -v cygpath >/dev/null 2>&1 || continue
|
||||
_sp_candidate="$(cygpath -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
# Convert with Git Bash's fixed system helper, never PATH.
|
||||
_sp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "$_sp_cygpath" ] && [ -x "$_sp_cygpath" ] || continue
|
||||
_sp_candidate="$("$_sp_cygpath" -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
[ -f "$_sp_candidate" ] || continue
|
||||
[ -x "$_sp_candidate" ] || continue
|
||||
if "$_sp_candidate" -c 'import sys; raise SystemExit(0 if sys.version_info >= (3, 8) else 1)' >/dev/null 2>&1; then
|
||||
@@ -58,6 +57,21 @@ select_python() {
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment may use only an interpreter path the caller explicitly trusted.
|
||||
select_explicit_python() {
|
||||
select_python_candidates "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"
|
||||
}
|
||||
|
||||
# After containment succeeds, PATH discovery remains a compatibility fallback
|
||||
# for hosts that do not export an interpreter path to direct hook invocations.
|
||||
select_python() {
|
||||
select_python_candidates \
|
||||
"${PWF_TRUSTED_PYTHON:-}" \
|
||||
"${PYTHON_BIN:-}" \
|
||||
"$(command -v python3 2>/dev/null)" \
|
||||
"$(command -v python 2>/dev/null)"
|
||||
}
|
||||
|
||||
# issue #195: per-invocation opt-out (PLANNING_DISABLED=1) for one-shot/CI
|
||||
# sessions that share a cwd with a plan but never opted into it.
|
||||
[ "${PLANNING_DISABLED:-}" = "1" ] && exit 0
|
||||
@@ -154,13 +168,24 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
# (Copied verbatim from resolve-plan-dir.sh so hook injection gets the same
|
||||
# symlink containment as the resolver — see security A1.3.)
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Matching is case-insensitive and works after slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils), then
|
||||
# readlink -f (older GNU), then the interpreter already validated by
|
||||
# select_python(). Prints the canonical absolute path on success; prints
|
||||
# nothing and returns 1 on a full miss so the caller can decide what to do.
|
||||
# The fallback must not rediscover or execute an unvalidated PATH interpreter.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
@@ -171,12 +196,8 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
if [ -n "${PWF_PYTHON:-}" ]; then
|
||||
out="$("${PWF_PYTHON}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -256,9 +277,9 @@ fi
|
||||
if [ -z "$RESOLVED" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; then RESOLVED="${PLAN_PREFIX}."; SCOPE="root"; fi
|
||||
[ -z "$RESOLVED" ] && exit 0
|
||||
|
||||
# Do not probe or execute any interpreter until a real, contained plan exists.
|
||||
# This keeps opt-out and no-plan hook fires side-effect free even when an
|
||||
# untrusted PYTHON_BIN or PATH entry points at an executable canary.
|
||||
# Do not probe or execute any interpreter until a real plan exists. Before
|
||||
# containment, only an explicit PWF_TRUSTED_PYTHON or PYTHON_BIN may be used.
|
||||
# PATH discovery remains deferred until containment succeeds.
|
||||
if [ "$SCOPE" = "root" ]; then
|
||||
PRECHECK_PLAN_FILE="${PLAN_PREFIX}task_plan.md"
|
||||
else
|
||||
@@ -266,8 +287,9 @@ else
|
||||
fi
|
||||
[ -f "$PRECHECK_PLAN_FILE" ] || exit 0
|
||||
[ -L "$PRECHECK_PLAN_FILE" ] && exit 0
|
||||
PWF_PYTHON="$(select_explicit_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
is_within_root "$PRECHECK_PLAN_FILE" || exit 0
|
||||
PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
[ -n "$PWF_PYTHON" ] || PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
|
||||
# Session attachment is evaluated only after plan existence is proven. A
|
||||
# stale sessions directory without any plan must not cause interpreter probes.
|
||||
|
||||
@@ -140,14 +140,17 @@ if ($env:PLAN_ID) {
|
||||
}
|
||||
}
|
||||
|
||||
if (Test-Path -LiteralPath $activeFile) {
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not $activeItem.PSIsContainer -and
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) {
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
} else {
|
||||
$planId = $null
|
||||
# Get-Item observes the link object even when its target is missing, unlike
|
||||
# Test-Path which follows the target. An active pointer that is a directory or
|
||||
# reparse point is an unsafe/ambiguous selector and must terminate resolution;
|
||||
# falling through would silently select and expose the newest unrelated plan.
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem) {
|
||||
if ($activeItem.PSIsContainer -or
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0)) {
|
||||
exit 0
|
||||
}
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
if ($planId -and (Test-ValidSlug $planId)) {
|
||||
$candidate = Join-Path $PlanRoot $planId
|
||||
if ((Test-Path $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
|
||||
|
||||
@@ -90,10 +90,54 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
@@ -105,12 +149,9 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -180,7 +221,8 @@ is_within_root() {
|
||||
}
|
||||
|
||||
# Portable mtime resolver. Tries GNU stat, BSD stat, BSD/macOS date -r,
|
||||
# python3, then perl. Returns "0" on full miss so callers can sort.
|
||||
# then an explicitly trusted Python interpreter. Returns "0" on a full miss
|
||||
# so newest-plan selection fails closed instead of executing from PATH.
|
||||
mtime_of() {
|
||||
target="$1"
|
||||
out="$(stat -c '%Y' "${target}" 2>/dev/null)"
|
||||
@@ -189,16 +231,9 @@ mtime_of() {
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
out="$(date -r "${target}" +%s 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
out="$(perl -e 'print((stat shift)[9])' "${target}" 2>/dev/null)"
|
||||
_mtime_python="$(trusted_python)" || _mtime_python=""
|
||||
if [ -n "${_mtime_python}" ]; then
|
||||
out="$("${_mtime_python}" -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
printf "0\n"
|
||||
|
||||
@@ -36,7 +36,7 @@ hooks:
|
||||
- type: command
|
||||
command: "SH=\"\"; for c in \"${PWF_SCRIPT_DIR}/inject-plan.sh\" \"${CLAUDE_SKILL_DIR}/scripts/inject-plan.sh\" \"$HOME/.claude/skills/planning-with-files-de/scripts/inject-plan.sh\" \"$HOME/.claude/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/inject-plan.sh\"; do [ -f \"$c\" ] && { SH=\"$c\"; break; }; done; [ -n \"$SH\" ] && sh \"$SH\" --context=precompact; exit 0"
|
||||
metadata:
|
||||
version: "3.12.0"
|
||||
version: "3.12.1"
|
||||
---
|
||||
|
||||
# Dateiplanungssystem
|
||||
|
||||
@@ -32,6 +32,9 @@ param(
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
if (-not $script:IsWindowsHost) {
|
||||
throw "Safe no-follow descriptor operations are unavailable in this PowerShell script on Unix. Use scripts/attest-plan.sh instead."
|
||||
}
|
||||
if ($script:IsWindowsHost -and -not ("PwfAttestationNative" -as [type])) {
|
||||
Add-Type -TypeDefinition @'
|
||||
using System;
|
||||
@@ -382,6 +385,21 @@ function Resolve-ContainedPlanFile {
|
||||
} catch { return $null }
|
||||
}
|
||||
|
||||
function Test-SlugPlanDirectory {
|
||||
param([string] $Directory)
|
||||
try {
|
||||
$finalDirectory = [PwfAttestationNative]::FinalDirectoryPath($Directory)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
$planningDirectory = Split-Path -Parent $finalDirectory
|
||||
$planId = Split-Path -Leaf $finalDirectory
|
||||
return (
|
||||
(Split-Path -Leaf $planningDirectory) -eq ".planning" -and
|
||||
$planId -match '^[A-Za-z0-9_][A-Za-z0-9._-]*$'
|
||||
)
|
||||
}
|
||||
|
||||
function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
@@ -395,10 +413,17 @@ function Resolve-PlanFile {
|
||||
# fall through and attest an unrelated legacy-root plan.
|
||||
if ($env:PWF_PLAN_ROOT -or $env:PLAN_ID) { return $null }
|
||||
$activePointer = Join-Path (Join-Path (Get-Location) ".planning") ".active_plan"
|
||||
if (Test-Path -LiteralPath $activePointer) { return $null }
|
||||
$activePointerItem = Get-Item -LiteralPath $activePointer -Force -ErrorAction SilentlyContinue
|
||||
if ($activePointerItem) { return $null }
|
||||
|
||||
$legacy = Join-Path (Get-Location) "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory (Get-Location).Path)
|
||||
$currentDirectory = (Get-Location).Path
|
||||
if (Test-SlugPlanDirectory $currentDirectory) {
|
||||
$slugPlan = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $slugPlan -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
$legacy = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
function Get-AttestationPath {
|
||||
@@ -406,6 +431,9 @@ function Get-AttestationPath {
|
||||
$planDir = Split-Path -Parent $PlanFile
|
||||
$cwd = (Get-Location).Path
|
||||
if ($planDir -eq $cwd) {
|
||||
if (Test-SlugPlanDirectory $cwd) {
|
||||
return (Join-Path $cwd ".attestation")
|
||||
}
|
||||
return (Join-Path $cwd ".plan-attestation")
|
||||
}
|
||||
return (Join-Path $planDir ".attestation")
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
# 1. $PLAN_ID env var → ./.planning/$PLAN_ID/
|
||||
# 2. ./.planning/.active_plan
|
||||
# 3. Newest ./.planning/<dir>/ by mtime
|
||||
# 4. Legacy ./task_plan.md at project root
|
||||
# 4. Current directory when it is .planning/<valid-slug>/
|
||||
# 5. Legacy ./task_plan.md at project root
|
||||
#
|
||||
# Usage:
|
||||
# sh scripts/attest-plan.sh # attest the active plan
|
||||
@@ -21,6 +22,25 @@ set -u
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
RESOLVER="${SCRIPT_DIR}/resolve-plan-dir.sh"
|
||||
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
resolve_from_slug_cwd() {
|
||||
slug_cwd="$(pwd -P 2>/dev/null)" || return 1
|
||||
planning_dir="${slug_cwd%/*}"
|
||||
[ "${planning_dir##*/}" = ".planning" ] || return 1
|
||||
plan_id="${slug_cwd##*/}"
|
||||
slug_is_valid "${plan_id}" || return 1
|
||||
[ -f "${slug_cwd}/task_plan.md" ] || return 1
|
||||
printf "%s\n" "${slug_cwd}/task_plan.md"
|
||||
}
|
||||
|
||||
resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
@@ -30,6 +50,22 @@ resolve_plan_file() {
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Explicit selectors are bindings, not hints. If the shared resolver
|
||||
# rejected one, do not attest a different plan through a cwd fallback.
|
||||
if [ -n "${PWF_PLAN_ROOT:-}" ] || [ -n "${PLAN_ID:-}" ]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
# An absolute script path does not change the invoking shell's cwd. When
|
||||
# that cwd is a slug plan directory, keep slug-mode storage semantics
|
||||
# instead of misclassifying its task_plan.md as a legacy root plan.
|
||||
slug_plan_file="$(resolve_from_slug_cwd)" || slug_plan_file=""
|
||||
if [ -n "${slug_plan_file}" ]; then
|
||||
printf "%s\n" "${slug_plan_file}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "./task_plan.md" ]; then
|
||||
printf "%s\n" "./task_plan.md"
|
||||
return 0
|
||||
|
||||
@@ -27,27 +27,26 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Select a working interpreter, not merely the first executable name on PATH.
|
||||
# Validate candidate interpreters supplied by the selector wrappers below.
|
||||
# Windows Store app aliases can exist as python3.exe while refusing every
|
||||
# script invocation. Probe candidates privately and fail closed if none runs.
|
||||
select_python() {
|
||||
# PWF_TRUSTED_PYTHON is the explicit trust path. PYTHON_BIN remains a
|
||||
# compatibility alias. PATH discovery is a deliberate fallback: the hook
|
||||
# treats the caller's PATH as executable trust, but still requires the
|
||||
# resolved candidate to be an absolute regular executable.
|
||||
for _sp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}" "$(command -v python3 2>/dev/null)" "$(command -v python 2>/dev/null)"; do
|
||||
select_python_candidates() {
|
||||
for _sp_candidate in "$@"; do
|
||||
[ -n "$_sp_candidate" ] || continue
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
case "$_sp_candidate" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
# Git Bash cannot reliably test or invoke C:\... spelling.
|
||||
# Convert before every filesystem predicate and invocation.
|
||||
command -v cygpath >/dev/null 2>&1 || continue
|
||||
_sp_candidate="$(cygpath -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
# Convert with Git Bash's fixed system helper, never PATH.
|
||||
_sp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "$_sp_cygpath" ] && [ -x "$_sp_cygpath" ] || continue
|
||||
_sp_candidate="$("$_sp_cygpath" -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
[ -f "$_sp_candidate" ] || continue
|
||||
[ -x "$_sp_candidate" ] || continue
|
||||
if "$_sp_candidate" -c 'import sys; raise SystemExit(0 if sys.version_info >= (3, 8) else 1)' >/dev/null 2>&1; then
|
||||
@@ -58,6 +57,21 @@ select_python() {
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment may use only an interpreter path the caller explicitly trusted.
|
||||
select_explicit_python() {
|
||||
select_python_candidates "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"
|
||||
}
|
||||
|
||||
# After containment succeeds, PATH discovery remains a compatibility fallback
|
||||
# for hosts that do not export an interpreter path to direct hook invocations.
|
||||
select_python() {
|
||||
select_python_candidates \
|
||||
"${PWF_TRUSTED_PYTHON:-}" \
|
||||
"${PYTHON_BIN:-}" \
|
||||
"$(command -v python3 2>/dev/null)" \
|
||||
"$(command -v python 2>/dev/null)"
|
||||
}
|
||||
|
||||
# issue #195: per-invocation opt-out (PLANNING_DISABLED=1) for one-shot/CI
|
||||
# sessions that share a cwd with a plan but never opted into it.
|
||||
[ "${PLANNING_DISABLED:-}" = "1" ] && exit 0
|
||||
@@ -154,13 +168,24 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
# (Copied verbatim from resolve-plan-dir.sh so hook injection gets the same
|
||||
# symlink containment as the resolver — see security A1.3.)
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Matching is case-insensitive and works after slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils), then
|
||||
# readlink -f (older GNU), then the interpreter already validated by
|
||||
# select_python(). Prints the canonical absolute path on success; prints
|
||||
# nothing and returns 1 on a full miss so the caller can decide what to do.
|
||||
# The fallback must not rediscover or execute an unvalidated PATH interpreter.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
@@ -171,12 +196,8 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
if [ -n "${PWF_PYTHON:-}" ]; then
|
||||
out="$("${PWF_PYTHON}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -256,9 +277,9 @@ fi
|
||||
if [ -z "$RESOLVED" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; then RESOLVED="${PLAN_PREFIX}."; SCOPE="root"; fi
|
||||
[ -z "$RESOLVED" ] && exit 0
|
||||
|
||||
# Do not probe or execute any interpreter until a real, contained plan exists.
|
||||
# This keeps opt-out and no-plan hook fires side-effect free even when an
|
||||
# untrusted PYTHON_BIN or PATH entry points at an executable canary.
|
||||
# Do not probe or execute any interpreter until a real plan exists. Before
|
||||
# containment, only an explicit PWF_TRUSTED_PYTHON or PYTHON_BIN may be used.
|
||||
# PATH discovery remains deferred until containment succeeds.
|
||||
if [ "$SCOPE" = "root" ]; then
|
||||
PRECHECK_PLAN_FILE="${PLAN_PREFIX}task_plan.md"
|
||||
else
|
||||
@@ -266,8 +287,9 @@ else
|
||||
fi
|
||||
[ -f "$PRECHECK_PLAN_FILE" ] || exit 0
|
||||
[ -L "$PRECHECK_PLAN_FILE" ] && exit 0
|
||||
PWF_PYTHON="$(select_explicit_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
is_within_root "$PRECHECK_PLAN_FILE" || exit 0
|
||||
PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
[ -n "$PWF_PYTHON" ] || PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
|
||||
# Session attachment is evaluated only after plan existence is proven. A
|
||||
# stale sessions directory without any plan must not cause interpreter probes.
|
||||
|
||||
@@ -140,14 +140,17 @@ if ($env:PLAN_ID) {
|
||||
}
|
||||
}
|
||||
|
||||
if (Test-Path -LiteralPath $activeFile) {
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not $activeItem.PSIsContainer -and
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) {
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
} else {
|
||||
$planId = $null
|
||||
# Get-Item observes the link object even when its target is missing, unlike
|
||||
# Test-Path which follows the target. An active pointer that is a directory or
|
||||
# reparse point is an unsafe/ambiguous selector and must terminate resolution;
|
||||
# falling through would silently select and expose the newest unrelated plan.
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem) {
|
||||
if ($activeItem.PSIsContainer -or
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0)) {
|
||||
exit 0
|
||||
}
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
if ($planId -and (Test-ValidSlug $planId)) {
|
||||
$candidate = Join-Path $PlanRoot $planId
|
||||
if ((Test-Path $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
|
||||
|
||||
@@ -90,10 +90,54 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
@@ -105,12 +149,9 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -180,7 +221,8 @@ is_within_root() {
|
||||
}
|
||||
|
||||
# Portable mtime resolver. Tries GNU stat, BSD stat, BSD/macOS date -r,
|
||||
# python3, then perl. Returns "0" on full miss so callers can sort.
|
||||
# then an explicitly trusted Python interpreter. Returns "0" on a full miss
|
||||
# so newest-plan selection fails closed instead of executing from PATH.
|
||||
mtime_of() {
|
||||
target="$1"
|
||||
out="$(stat -c '%Y' "${target}" 2>/dev/null)"
|
||||
@@ -189,16 +231,9 @@ mtime_of() {
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
out="$(date -r "${target}" +%s 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
out="$(perl -e 'print((stat shift)[9])' "${target}" 2>/dev/null)"
|
||||
_mtime_python="$(trusted_python)" || _mtime_python=""
|
||||
if [ -n "${_mtime_python}" ]; then
|
||||
out="$("${_mtime_python}" -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
printf "0\n"
|
||||
|
||||
@@ -36,7 +36,7 @@ hooks:
|
||||
- type: command
|
||||
command: "SH=\"\"; for c in \"${PWF_SCRIPT_DIR}/inject-plan.sh\" \"${CLAUDE_SKILL_DIR}/scripts/inject-plan.sh\" \"$HOME/.claude/skills/planning-with-files-es/scripts/inject-plan.sh\" \"$HOME/.claude/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/inject-plan.sh\"; do [ -f \"$c\" ] && { SH=\"$c\"; break; }; done; [ -n \"$SH\" ] && sh \"$SH\" --context=precompact; exit 0"
|
||||
metadata:
|
||||
version: "3.12.0"
|
||||
version: "3.12.1"
|
||||
---
|
||||
|
||||
# Sistema de Planificación con Archivos
|
||||
|
||||
@@ -32,6 +32,9 @@ param(
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
if (-not $script:IsWindowsHost) {
|
||||
throw "Safe no-follow descriptor operations are unavailable in this PowerShell script on Unix. Use scripts/attest-plan.sh instead."
|
||||
}
|
||||
if ($script:IsWindowsHost -and -not ("PwfAttestationNative" -as [type])) {
|
||||
Add-Type -TypeDefinition @'
|
||||
using System;
|
||||
@@ -382,6 +385,21 @@ function Resolve-ContainedPlanFile {
|
||||
} catch { return $null }
|
||||
}
|
||||
|
||||
function Test-SlugPlanDirectory {
|
||||
param([string] $Directory)
|
||||
try {
|
||||
$finalDirectory = [PwfAttestationNative]::FinalDirectoryPath($Directory)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
$planningDirectory = Split-Path -Parent $finalDirectory
|
||||
$planId = Split-Path -Leaf $finalDirectory
|
||||
return (
|
||||
(Split-Path -Leaf $planningDirectory) -eq ".planning" -and
|
||||
$planId -match '^[A-Za-z0-9_][A-Za-z0-9._-]*$'
|
||||
)
|
||||
}
|
||||
|
||||
function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
@@ -395,10 +413,17 @@ function Resolve-PlanFile {
|
||||
# fall through and attest an unrelated legacy-root plan.
|
||||
if ($env:PWF_PLAN_ROOT -or $env:PLAN_ID) { return $null }
|
||||
$activePointer = Join-Path (Join-Path (Get-Location) ".planning") ".active_plan"
|
||||
if (Test-Path -LiteralPath $activePointer) { return $null }
|
||||
$activePointerItem = Get-Item -LiteralPath $activePointer -Force -ErrorAction SilentlyContinue
|
||||
if ($activePointerItem) { return $null }
|
||||
|
||||
$legacy = Join-Path (Get-Location) "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory (Get-Location).Path)
|
||||
$currentDirectory = (Get-Location).Path
|
||||
if (Test-SlugPlanDirectory $currentDirectory) {
|
||||
$slugPlan = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $slugPlan -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
$legacy = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
function Get-AttestationPath {
|
||||
@@ -406,6 +431,9 @@ function Get-AttestationPath {
|
||||
$planDir = Split-Path -Parent $PlanFile
|
||||
$cwd = (Get-Location).Path
|
||||
if ($planDir -eq $cwd) {
|
||||
if (Test-SlugPlanDirectory $cwd) {
|
||||
return (Join-Path $cwd ".attestation")
|
||||
}
|
||||
return (Join-Path $cwd ".plan-attestation")
|
||||
}
|
||||
return (Join-Path $planDir ".attestation")
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
# 1. $PLAN_ID env var → ./.planning/$PLAN_ID/
|
||||
# 2. ./.planning/.active_plan
|
||||
# 3. Newest ./.planning/<dir>/ by mtime
|
||||
# 4. Legacy ./task_plan.md at project root
|
||||
# 4. Current directory when it is .planning/<valid-slug>/
|
||||
# 5. Legacy ./task_plan.md at project root
|
||||
#
|
||||
# Usage:
|
||||
# sh scripts/attest-plan.sh # attest the active plan
|
||||
@@ -21,6 +22,25 @@ set -u
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
RESOLVER="${SCRIPT_DIR}/resolve-plan-dir.sh"
|
||||
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
resolve_from_slug_cwd() {
|
||||
slug_cwd="$(pwd -P 2>/dev/null)" || return 1
|
||||
planning_dir="${slug_cwd%/*}"
|
||||
[ "${planning_dir##*/}" = ".planning" ] || return 1
|
||||
plan_id="${slug_cwd##*/}"
|
||||
slug_is_valid "${plan_id}" || return 1
|
||||
[ -f "${slug_cwd}/task_plan.md" ] || return 1
|
||||
printf "%s\n" "${slug_cwd}/task_plan.md"
|
||||
}
|
||||
|
||||
resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
@@ -30,6 +50,22 @@ resolve_plan_file() {
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Explicit selectors are bindings, not hints. If the shared resolver
|
||||
# rejected one, do not attest a different plan through a cwd fallback.
|
||||
if [ -n "${PWF_PLAN_ROOT:-}" ] || [ -n "${PLAN_ID:-}" ]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
# An absolute script path does not change the invoking shell's cwd. When
|
||||
# that cwd is a slug plan directory, keep slug-mode storage semantics
|
||||
# instead of misclassifying its task_plan.md as a legacy root plan.
|
||||
slug_plan_file="$(resolve_from_slug_cwd)" || slug_plan_file=""
|
||||
if [ -n "${slug_plan_file}" ]; then
|
||||
printf "%s\n" "${slug_plan_file}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "./task_plan.md" ]; then
|
||||
printf "%s\n" "./task_plan.md"
|
||||
return 0
|
||||
|
||||
@@ -27,27 +27,26 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Select a working interpreter, not merely the first executable name on PATH.
|
||||
# Validate candidate interpreters supplied by the selector wrappers below.
|
||||
# Windows Store app aliases can exist as python3.exe while refusing every
|
||||
# script invocation. Probe candidates privately and fail closed if none runs.
|
||||
select_python() {
|
||||
# PWF_TRUSTED_PYTHON is the explicit trust path. PYTHON_BIN remains a
|
||||
# compatibility alias. PATH discovery is a deliberate fallback: the hook
|
||||
# treats the caller's PATH as executable trust, but still requires the
|
||||
# resolved candidate to be an absolute regular executable.
|
||||
for _sp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}" "$(command -v python3 2>/dev/null)" "$(command -v python 2>/dev/null)"; do
|
||||
select_python_candidates() {
|
||||
for _sp_candidate in "$@"; do
|
||||
[ -n "$_sp_candidate" ] || continue
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
case "$_sp_candidate" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
# Git Bash cannot reliably test or invoke C:\... spelling.
|
||||
# Convert before every filesystem predicate and invocation.
|
||||
command -v cygpath >/dev/null 2>&1 || continue
|
||||
_sp_candidate="$(cygpath -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
# Convert with Git Bash's fixed system helper, never PATH.
|
||||
_sp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "$_sp_cygpath" ] && [ -x "$_sp_cygpath" ] || continue
|
||||
_sp_candidate="$("$_sp_cygpath" -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
[ -f "$_sp_candidate" ] || continue
|
||||
[ -x "$_sp_candidate" ] || continue
|
||||
if "$_sp_candidate" -c 'import sys; raise SystemExit(0 if sys.version_info >= (3, 8) else 1)' >/dev/null 2>&1; then
|
||||
@@ -58,6 +57,21 @@ select_python() {
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment may use only an interpreter path the caller explicitly trusted.
|
||||
select_explicit_python() {
|
||||
select_python_candidates "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"
|
||||
}
|
||||
|
||||
# After containment succeeds, PATH discovery remains a compatibility fallback
|
||||
# for hosts that do not export an interpreter path to direct hook invocations.
|
||||
select_python() {
|
||||
select_python_candidates \
|
||||
"${PWF_TRUSTED_PYTHON:-}" \
|
||||
"${PYTHON_BIN:-}" \
|
||||
"$(command -v python3 2>/dev/null)" \
|
||||
"$(command -v python 2>/dev/null)"
|
||||
}
|
||||
|
||||
# issue #195: per-invocation opt-out (PLANNING_DISABLED=1) for one-shot/CI
|
||||
# sessions that share a cwd with a plan but never opted into it.
|
||||
[ "${PLANNING_DISABLED:-}" = "1" ] && exit 0
|
||||
@@ -154,13 +168,24 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
# (Copied verbatim from resolve-plan-dir.sh so hook injection gets the same
|
||||
# symlink containment as the resolver — see security A1.3.)
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Matching is case-insensitive and works after slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils), then
|
||||
# readlink -f (older GNU), then the interpreter already validated by
|
||||
# select_python(). Prints the canonical absolute path on success; prints
|
||||
# nothing and returns 1 on a full miss so the caller can decide what to do.
|
||||
# The fallback must not rediscover or execute an unvalidated PATH interpreter.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
@@ -171,12 +196,8 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
if [ -n "${PWF_PYTHON:-}" ]; then
|
||||
out="$("${PWF_PYTHON}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -256,9 +277,9 @@ fi
|
||||
if [ -z "$RESOLVED" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; then RESOLVED="${PLAN_PREFIX}."; SCOPE="root"; fi
|
||||
[ -z "$RESOLVED" ] && exit 0
|
||||
|
||||
# Do not probe or execute any interpreter until a real, contained plan exists.
|
||||
# This keeps opt-out and no-plan hook fires side-effect free even when an
|
||||
# untrusted PYTHON_BIN or PATH entry points at an executable canary.
|
||||
# Do not probe or execute any interpreter until a real plan exists. Before
|
||||
# containment, only an explicit PWF_TRUSTED_PYTHON or PYTHON_BIN may be used.
|
||||
# PATH discovery remains deferred until containment succeeds.
|
||||
if [ "$SCOPE" = "root" ]; then
|
||||
PRECHECK_PLAN_FILE="${PLAN_PREFIX}task_plan.md"
|
||||
else
|
||||
@@ -266,8 +287,9 @@ else
|
||||
fi
|
||||
[ -f "$PRECHECK_PLAN_FILE" ] || exit 0
|
||||
[ -L "$PRECHECK_PLAN_FILE" ] && exit 0
|
||||
PWF_PYTHON="$(select_explicit_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
is_within_root "$PRECHECK_PLAN_FILE" || exit 0
|
||||
PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
[ -n "$PWF_PYTHON" ] || PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
|
||||
# Session attachment is evaluated only after plan existence is proven. A
|
||||
# stale sessions directory without any plan must not cause interpreter probes.
|
||||
|
||||
@@ -140,14 +140,17 @@ if ($env:PLAN_ID) {
|
||||
}
|
||||
}
|
||||
|
||||
if (Test-Path -LiteralPath $activeFile) {
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not $activeItem.PSIsContainer -and
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) {
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
} else {
|
||||
$planId = $null
|
||||
# Get-Item observes the link object even when its target is missing, unlike
|
||||
# Test-Path which follows the target. An active pointer that is a directory or
|
||||
# reparse point is an unsafe/ambiguous selector and must terminate resolution;
|
||||
# falling through would silently select and expose the newest unrelated plan.
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem) {
|
||||
if ($activeItem.PSIsContainer -or
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0)) {
|
||||
exit 0
|
||||
}
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
if ($planId -and (Test-ValidSlug $planId)) {
|
||||
$candidate = Join-Path $PlanRoot $planId
|
||||
if ((Test-Path $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
|
||||
|
||||
@@ -90,10 +90,54 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
@@ -105,12 +149,9 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -180,7 +221,8 @@ is_within_root() {
|
||||
}
|
||||
|
||||
# Portable mtime resolver. Tries GNU stat, BSD stat, BSD/macOS date -r,
|
||||
# python3, then perl. Returns "0" on full miss so callers can sort.
|
||||
# then an explicitly trusted Python interpreter. Returns "0" on a full miss
|
||||
# so newest-plan selection fails closed instead of executing from PATH.
|
||||
mtime_of() {
|
||||
target="$1"
|
||||
out="$(stat -c '%Y' "${target}" 2>/dev/null)"
|
||||
@@ -189,16 +231,9 @@ mtime_of() {
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
out="$(date -r "${target}" +%s 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
out="$(perl -e 'print((stat shift)[9])' "${target}" 2>/dev/null)"
|
||||
_mtime_python="$(trusted_python)" || _mtime_python=""
|
||||
if [ -n "${_mtime_python}" ]; then
|
||||
out="$("${_mtime_python}" -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
printf "0\n"
|
||||
|
||||
@@ -37,7 +37,7 @@ hooks:
|
||||
command: "SH=\"\"; for c in \"${PWF_SCRIPT_DIR}/inject-plan.sh\" \"${CLAUDE_SKILL_DIR}/scripts/inject-plan.sh\" \"$HOME/.claude/skills/planning-with-files-zh/scripts/inject-plan.sh\" \"$HOME/.claude/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/inject-plan.sh\"; do [ -f \"$c\" ] && { SH=\"$c\"; break; }; done; [ -n \"$SH\" ] && sh \"$SH\" --context=precompact; exit 0"
|
||||
metadata:
|
||||
|
||||
version: "3.12.0"
|
||||
version: "3.12.1"
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -32,6 +32,9 @@ param(
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
if (-not $script:IsWindowsHost) {
|
||||
throw "Safe no-follow descriptor operations are unavailable in this PowerShell script on Unix. Use scripts/attest-plan.sh instead."
|
||||
}
|
||||
if ($script:IsWindowsHost -and -not ("PwfAttestationNative" -as [type])) {
|
||||
Add-Type -TypeDefinition @'
|
||||
using System;
|
||||
@@ -382,6 +385,21 @@ function Resolve-ContainedPlanFile {
|
||||
} catch { return $null }
|
||||
}
|
||||
|
||||
function Test-SlugPlanDirectory {
|
||||
param([string] $Directory)
|
||||
try {
|
||||
$finalDirectory = [PwfAttestationNative]::FinalDirectoryPath($Directory)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
$planningDirectory = Split-Path -Parent $finalDirectory
|
||||
$planId = Split-Path -Leaf $finalDirectory
|
||||
return (
|
||||
(Split-Path -Leaf $planningDirectory) -eq ".planning" -and
|
||||
$planId -match '^[A-Za-z0-9_][A-Za-z0-9._-]*$'
|
||||
)
|
||||
}
|
||||
|
||||
function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
@@ -395,10 +413,17 @@ function Resolve-PlanFile {
|
||||
# fall through and attest an unrelated legacy-root plan.
|
||||
if ($env:PWF_PLAN_ROOT -or $env:PLAN_ID) { return $null }
|
||||
$activePointer = Join-Path (Join-Path (Get-Location) ".planning") ".active_plan"
|
||||
if (Test-Path -LiteralPath $activePointer) { return $null }
|
||||
$activePointerItem = Get-Item -LiteralPath $activePointer -Force -ErrorAction SilentlyContinue
|
||||
if ($activePointerItem) { return $null }
|
||||
|
||||
$legacy = Join-Path (Get-Location) "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory (Get-Location).Path)
|
||||
$currentDirectory = (Get-Location).Path
|
||||
if (Test-SlugPlanDirectory $currentDirectory) {
|
||||
$slugPlan = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $slugPlan -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
$legacy = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
function Get-AttestationPath {
|
||||
@@ -406,6 +431,9 @@ function Get-AttestationPath {
|
||||
$planDir = Split-Path -Parent $PlanFile
|
||||
$cwd = (Get-Location).Path
|
||||
if ($planDir -eq $cwd) {
|
||||
if (Test-SlugPlanDirectory $cwd) {
|
||||
return (Join-Path $cwd ".attestation")
|
||||
}
|
||||
return (Join-Path $cwd ".plan-attestation")
|
||||
}
|
||||
return (Join-Path $planDir ".attestation")
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
# 1. $PLAN_ID env var → ./.planning/$PLAN_ID/
|
||||
# 2. ./.planning/.active_plan
|
||||
# 3. Newest ./.planning/<dir>/ by mtime
|
||||
# 4. Legacy ./task_plan.md at project root
|
||||
# 4. Current directory when it is .planning/<valid-slug>/
|
||||
# 5. Legacy ./task_plan.md at project root
|
||||
#
|
||||
# Usage:
|
||||
# sh scripts/attest-plan.sh # attest the active plan
|
||||
@@ -21,6 +22,25 @@ set -u
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
RESOLVER="${SCRIPT_DIR}/resolve-plan-dir.sh"
|
||||
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
resolve_from_slug_cwd() {
|
||||
slug_cwd="$(pwd -P 2>/dev/null)" || return 1
|
||||
planning_dir="${slug_cwd%/*}"
|
||||
[ "${planning_dir##*/}" = ".planning" ] || return 1
|
||||
plan_id="${slug_cwd##*/}"
|
||||
slug_is_valid "${plan_id}" || return 1
|
||||
[ -f "${slug_cwd}/task_plan.md" ] || return 1
|
||||
printf "%s\n" "${slug_cwd}/task_plan.md"
|
||||
}
|
||||
|
||||
resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
@@ -30,6 +50,22 @@ resolve_plan_file() {
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Explicit selectors are bindings, not hints. If the shared resolver
|
||||
# rejected one, do not attest a different plan through a cwd fallback.
|
||||
if [ -n "${PWF_PLAN_ROOT:-}" ] || [ -n "${PLAN_ID:-}" ]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
# An absolute script path does not change the invoking shell's cwd. When
|
||||
# that cwd is a slug plan directory, keep slug-mode storage semantics
|
||||
# instead of misclassifying its task_plan.md as a legacy root plan.
|
||||
slug_plan_file="$(resolve_from_slug_cwd)" || slug_plan_file=""
|
||||
if [ -n "${slug_plan_file}" ]; then
|
||||
printf "%s\n" "${slug_plan_file}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "./task_plan.md" ]; then
|
||||
printf "%s\n" "./task_plan.md"
|
||||
return 0
|
||||
|
||||
@@ -27,27 +27,26 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Select a working interpreter, not merely the first executable name on PATH.
|
||||
# Validate candidate interpreters supplied by the selector wrappers below.
|
||||
# Windows Store app aliases can exist as python3.exe while refusing every
|
||||
# script invocation. Probe candidates privately and fail closed if none runs.
|
||||
select_python() {
|
||||
# PWF_TRUSTED_PYTHON is the explicit trust path. PYTHON_BIN remains a
|
||||
# compatibility alias. PATH discovery is a deliberate fallback: the hook
|
||||
# treats the caller's PATH as executable trust, but still requires the
|
||||
# resolved candidate to be an absolute regular executable.
|
||||
for _sp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}" "$(command -v python3 2>/dev/null)" "$(command -v python 2>/dev/null)"; do
|
||||
select_python_candidates() {
|
||||
for _sp_candidate in "$@"; do
|
||||
[ -n "$_sp_candidate" ] || continue
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
case "$_sp_candidate" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
# Git Bash cannot reliably test or invoke C:\... spelling.
|
||||
# Convert before every filesystem predicate and invocation.
|
||||
command -v cygpath >/dev/null 2>&1 || continue
|
||||
_sp_candidate="$(cygpath -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
# Convert with Git Bash's fixed system helper, never PATH.
|
||||
_sp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "$_sp_cygpath" ] && [ -x "$_sp_cygpath" ] || continue
|
||||
_sp_candidate="$("$_sp_cygpath" -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
[ -f "$_sp_candidate" ] || continue
|
||||
[ -x "$_sp_candidate" ] || continue
|
||||
if "$_sp_candidate" -c 'import sys; raise SystemExit(0 if sys.version_info >= (3, 8) else 1)' >/dev/null 2>&1; then
|
||||
@@ -58,6 +57,21 @@ select_python() {
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment may use only an interpreter path the caller explicitly trusted.
|
||||
select_explicit_python() {
|
||||
select_python_candidates "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"
|
||||
}
|
||||
|
||||
# After containment succeeds, PATH discovery remains a compatibility fallback
|
||||
# for hosts that do not export an interpreter path to direct hook invocations.
|
||||
select_python() {
|
||||
select_python_candidates \
|
||||
"${PWF_TRUSTED_PYTHON:-}" \
|
||||
"${PYTHON_BIN:-}" \
|
||||
"$(command -v python3 2>/dev/null)" \
|
||||
"$(command -v python 2>/dev/null)"
|
||||
}
|
||||
|
||||
# issue #195: per-invocation opt-out (PLANNING_DISABLED=1) for one-shot/CI
|
||||
# sessions that share a cwd with a plan but never opted into it.
|
||||
[ "${PLANNING_DISABLED:-}" = "1" ] && exit 0
|
||||
@@ -154,13 +168,24 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
# (Copied verbatim from resolve-plan-dir.sh so hook injection gets the same
|
||||
# symlink containment as the resolver — see security A1.3.)
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Matching is case-insensitive and works after slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils), then
|
||||
# readlink -f (older GNU), then the interpreter already validated by
|
||||
# select_python(). Prints the canonical absolute path on success; prints
|
||||
# nothing and returns 1 on a full miss so the caller can decide what to do.
|
||||
# The fallback must not rediscover or execute an unvalidated PATH interpreter.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
@@ -171,12 +196,8 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
if [ -n "${PWF_PYTHON:-}" ]; then
|
||||
out="$("${PWF_PYTHON}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -256,9 +277,9 @@ fi
|
||||
if [ -z "$RESOLVED" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; then RESOLVED="${PLAN_PREFIX}."; SCOPE="root"; fi
|
||||
[ -z "$RESOLVED" ] && exit 0
|
||||
|
||||
# Do not probe or execute any interpreter until a real, contained plan exists.
|
||||
# This keeps opt-out and no-plan hook fires side-effect free even when an
|
||||
# untrusted PYTHON_BIN or PATH entry points at an executable canary.
|
||||
# Do not probe or execute any interpreter until a real plan exists. Before
|
||||
# containment, only an explicit PWF_TRUSTED_PYTHON or PYTHON_BIN may be used.
|
||||
# PATH discovery remains deferred until containment succeeds.
|
||||
if [ "$SCOPE" = "root" ]; then
|
||||
PRECHECK_PLAN_FILE="${PLAN_PREFIX}task_plan.md"
|
||||
else
|
||||
@@ -266,8 +287,9 @@ else
|
||||
fi
|
||||
[ -f "$PRECHECK_PLAN_FILE" ] || exit 0
|
||||
[ -L "$PRECHECK_PLAN_FILE" ] && exit 0
|
||||
PWF_PYTHON="$(select_explicit_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
is_within_root "$PRECHECK_PLAN_FILE" || exit 0
|
||||
PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
[ -n "$PWF_PYTHON" ] || PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
|
||||
# Session attachment is evaluated only after plan existence is proven. A
|
||||
# stale sessions directory without any plan must not cause interpreter probes.
|
||||
|
||||
@@ -140,14 +140,17 @@ if ($env:PLAN_ID) {
|
||||
}
|
||||
}
|
||||
|
||||
if (Test-Path -LiteralPath $activeFile) {
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not $activeItem.PSIsContainer -and
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) {
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
} else {
|
||||
$planId = $null
|
||||
# Get-Item observes the link object even when its target is missing, unlike
|
||||
# Test-Path which follows the target. An active pointer that is a directory or
|
||||
# reparse point is an unsafe/ambiguous selector and must terminate resolution;
|
||||
# falling through would silently select and expose the newest unrelated plan.
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem) {
|
||||
if ($activeItem.PSIsContainer -or
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0)) {
|
||||
exit 0
|
||||
}
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
if ($planId -and (Test-ValidSlug $planId)) {
|
||||
$candidate = Join-Path $PlanRoot $planId
|
||||
if ((Test-Path $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
|
||||
|
||||
@@ -90,10 +90,54 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
@@ -105,12 +149,9 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -180,7 +221,8 @@ is_within_root() {
|
||||
}
|
||||
|
||||
# Portable mtime resolver. Tries GNU stat, BSD stat, BSD/macOS date -r,
|
||||
# python3, then perl. Returns "0" on full miss so callers can sort.
|
||||
# then an explicitly trusted Python interpreter. Returns "0" on a full miss
|
||||
# so newest-plan selection fails closed instead of executing from PATH.
|
||||
mtime_of() {
|
||||
target="$1"
|
||||
out="$(stat -c '%Y' "${target}" 2>/dev/null)"
|
||||
@@ -189,16 +231,9 @@ mtime_of() {
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
out="$(date -r "${target}" +%s 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
out="$(perl -e 'print((stat shift)[9])' "${target}" 2>/dev/null)"
|
||||
_mtime_python="$(trusted_python)" || _mtime_python=""
|
||||
if [ -n "${_mtime_python}" ]; then
|
||||
out="$("${_mtime_python}" -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
printf "0\n"
|
||||
|
||||
@@ -37,7 +37,7 @@ hooks:
|
||||
command: "SH=\"\"; for c in \"${PWF_SCRIPT_DIR}/inject-plan.sh\" \"${CLAUDE_SKILL_DIR}/scripts/inject-plan.sh\" \"$HOME/.claude/skills/planning-with-files-zht/scripts/inject-plan.sh\" \"$HOME/.claude/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/inject-plan.sh\"; do [ -f \"$c\" ] && { SH=\"$c\"; break; }; done; [ -n \"$SH\" ] && sh \"$SH\" --context=precompact; exit 0"
|
||||
metadata:
|
||||
|
||||
version: "3.12.0"
|
||||
version: "3.12.1"
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -32,6 +32,9 @@ param(
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
if (-not $script:IsWindowsHost) {
|
||||
throw "Safe no-follow descriptor operations are unavailable in this PowerShell script on Unix. Use scripts/attest-plan.sh instead."
|
||||
}
|
||||
if ($script:IsWindowsHost -and -not ("PwfAttestationNative" -as [type])) {
|
||||
Add-Type -TypeDefinition @'
|
||||
using System;
|
||||
@@ -382,6 +385,21 @@ function Resolve-ContainedPlanFile {
|
||||
} catch { return $null }
|
||||
}
|
||||
|
||||
function Test-SlugPlanDirectory {
|
||||
param([string] $Directory)
|
||||
try {
|
||||
$finalDirectory = [PwfAttestationNative]::FinalDirectoryPath($Directory)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
$planningDirectory = Split-Path -Parent $finalDirectory
|
||||
$planId = Split-Path -Leaf $finalDirectory
|
||||
return (
|
||||
(Split-Path -Leaf $planningDirectory) -eq ".planning" -and
|
||||
$planId -match '^[A-Za-z0-9_][A-Za-z0-9._-]*$'
|
||||
)
|
||||
}
|
||||
|
||||
function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
@@ -395,10 +413,17 @@ function Resolve-PlanFile {
|
||||
# fall through and attest an unrelated legacy-root plan.
|
||||
if ($env:PWF_PLAN_ROOT -or $env:PLAN_ID) { return $null }
|
||||
$activePointer = Join-Path (Join-Path (Get-Location) ".planning") ".active_plan"
|
||||
if (Test-Path -LiteralPath $activePointer) { return $null }
|
||||
$activePointerItem = Get-Item -LiteralPath $activePointer -Force -ErrorAction SilentlyContinue
|
||||
if ($activePointerItem) { return $null }
|
||||
|
||||
$legacy = Join-Path (Get-Location) "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory (Get-Location).Path)
|
||||
$currentDirectory = (Get-Location).Path
|
||||
if (Test-SlugPlanDirectory $currentDirectory) {
|
||||
$slugPlan = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $slugPlan -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
$legacy = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
function Get-AttestationPath {
|
||||
@@ -406,6 +431,9 @@ function Get-AttestationPath {
|
||||
$planDir = Split-Path -Parent $PlanFile
|
||||
$cwd = (Get-Location).Path
|
||||
if ($planDir -eq $cwd) {
|
||||
if (Test-SlugPlanDirectory $cwd) {
|
||||
return (Join-Path $cwd ".attestation")
|
||||
}
|
||||
return (Join-Path $cwd ".plan-attestation")
|
||||
}
|
||||
return (Join-Path $planDir ".attestation")
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
# 1. $PLAN_ID env var → ./.planning/$PLAN_ID/
|
||||
# 2. ./.planning/.active_plan
|
||||
# 3. Newest ./.planning/<dir>/ by mtime
|
||||
# 4. Legacy ./task_plan.md at project root
|
||||
# 4. Current directory when it is .planning/<valid-slug>/
|
||||
# 5. Legacy ./task_plan.md at project root
|
||||
#
|
||||
# Usage:
|
||||
# sh scripts/attest-plan.sh # attest the active plan
|
||||
@@ -21,6 +22,25 @@ set -u
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
RESOLVER="${SCRIPT_DIR}/resolve-plan-dir.sh"
|
||||
|
||||
slug_is_valid() {
|
||||
case "$1" in
|
||||
'') return 1 ;;
|
||||
*[!A-Za-z0-9._-]*) return 1 ;;
|
||||
[A-Za-z0-9_]*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
resolve_from_slug_cwd() {
|
||||
slug_cwd="$(pwd -P 2>/dev/null)" || return 1
|
||||
planning_dir="${slug_cwd%/*}"
|
||||
[ "${planning_dir##*/}" = ".planning" ] || return 1
|
||||
plan_id="${slug_cwd##*/}"
|
||||
slug_is_valid "${plan_id}" || return 1
|
||||
[ -f "${slug_cwd}/task_plan.md" ] || return 1
|
||||
printf "%s\n" "${slug_cwd}/task_plan.md"
|
||||
}
|
||||
|
||||
resolve_plan_file() {
|
||||
plan_dir=""
|
||||
if [ -f "${RESOLVER}" ]; then
|
||||
@@ -30,6 +50,22 @@ resolve_plan_file() {
|
||||
printf "%s\n" "${plan_dir}/task_plan.md"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Explicit selectors are bindings, not hints. If the shared resolver
|
||||
# rejected one, do not attest a different plan through a cwd fallback.
|
||||
if [ -n "${PWF_PLAN_ROOT:-}" ] || [ -n "${PLAN_ID:-}" ]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
# An absolute script path does not change the invoking shell's cwd. When
|
||||
# that cwd is a slug plan directory, keep slug-mode storage semantics
|
||||
# instead of misclassifying its task_plan.md as a legacy root plan.
|
||||
slug_plan_file="$(resolve_from_slug_cwd)" || slug_plan_file=""
|
||||
if [ -n "${slug_plan_file}" ]; then
|
||||
printf "%s\n" "${slug_plan_file}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "./task_plan.md" ]; then
|
||||
printf "%s\n" "./task_plan.md"
|
||||
return 0
|
||||
|
||||
@@ -27,27 +27,26 @@
|
||||
|
||||
set -u
|
||||
|
||||
# Select a working interpreter, not merely the first executable name on PATH.
|
||||
# Validate candidate interpreters supplied by the selector wrappers below.
|
||||
# Windows Store app aliases can exist as python3.exe while refusing every
|
||||
# script invocation. Probe candidates privately and fail closed if none runs.
|
||||
select_python() {
|
||||
# PWF_TRUSTED_PYTHON is the explicit trust path. PYTHON_BIN remains a
|
||||
# compatibility alias. PATH discovery is a deliberate fallback: the hook
|
||||
# treats the caller's PATH as executable trust, but still requires the
|
||||
# resolved candidate to be an absolute regular executable.
|
||||
for _sp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}" "$(command -v python3 2>/dev/null)" "$(command -v python 2>/dev/null)"; do
|
||||
select_python_candidates() {
|
||||
for _sp_candidate in "$@"; do
|
||||
[ -n "$_sp_candidate" ] || continue
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
case "$_sp_candidate" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
# Git Bash cannot reliably test or invoke C:\... spelling.
|
||||
# Convert before every filesystem predicate and invocation.
|
||||
command -v cygpath >/dev/null 2>&1 || continue
|
||||
_sp_candidate="$(cygpath -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
# Convert with Git Bash's fixed system helper, never PATH.
|
||||
_sp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "$_sp_cygpath" ] && [ -x "$_sp_cygpath" ] || continue
|
||||
_sp_candidate="$("$_sp_cygpath" -u "$_sp_candidate" 2>/dev/null)" || continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "$_sp_candidate" && continue
|
||||
[ -f "$_sp_candidate" ] || continue
|
||||
[ -x "$_sp_candidate" ] || continue
|
||||
if "$_sp_candidate" -c 'import sys; raise SystemExit(0 if sys.version_info >= (3, 8) else 1)' >/dev/null 2>&1; then
|
||||
@@ -58,6 +57,21 @@ select_python() {
|
||||
return 1
|
||||
}
|
||||
|
||||
# Containment may use only an interpreter path the caller explicitly trusted.
|
||||
select_explicit_python() {
|
||||
select_python_candidates "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"
|
||||
}
|
||||
|
||||
# After containment succeeds, PATH discovery remains a compatibility fallback
|
||||
# for hosts that do not export an interpreter path to direct hook invocations.
|
||||
select_python() {
|
||||
select_python_candidates \
|
||||
"${PWF_TRUSTED_PYTHON:-}" \
|
||||
"${PYTHON_BIN:-}" \
|
||||
"$(command -v python3 2>/dev/null)" \
|
||||
"$(command -v python 2>/dev/null)"
|
||||
}
|
||||
|
||||
# issue #195: per-invocation opt-out (PLANNING_DISABLED=1) for one-shot/CI
|
||||
# sessions that share a cwd with a plan but never opted into it.
|
||||
[ "${PLANNING_DISABLED:-}" = "1" ] && exit 0
|
||||
@@ -154,13 +168,24 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
# (Copied verbatim from resolve-plan-dir.sh so hook injection gets the same
|
||||
# symlink containment as the resolver — see security A1.3.)
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Matching is case-insensitive and works after slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils), then
|
||||
# readlink -f (older GNU), then the interpreter already validated by
|
||||
# select_python(). Prints the canonical absolute path on success; prints
|
||||
# nothing and returns 1 on a full miss so the caller can decide what to do.
|
||||
# The fallback must not rediscover or execute an unvalidated PATH interpreter.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
if command -v realpath >/dev/null 2>&1; then
|
||||
@@ -171,12 +196,8 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
if [ -n "${PWF_PYTHON:-}" ]; then
|
||||
out="$("${PWF_PYTHON}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -256,9 +277,9 @@ fi
|
||||
if [ -z "$RESOLVED" ] && [ -f "${PLAN_PREFIX}task_plan.md" ]; then RESOLVED="${PLAN_PREFIX}."; SCOPE="root"; fi
|
||||
[ -z "$RESOLVED" ] && exit 0
|
||||
|
||||
# Do not probe or execute any interpreter until a real, contained plan exists.
|
||||
# This keeps opt-out and no-plan hook fires side-effect free even when an
|
||||
# untrusted PYTHON_BIN or PATH entry points at an executable canary.
|
||||
# Do not probe or execute any interpreter until a real plan exists. Before
|
||||
# containment, only an explicit PWF_TRUSTED_PYTHON or PYTHON_BIN may be used.
|
||||
# PATH discovery remains deferred until containment succeeds.
|
||||
if [ "$SCOPE" = "root" ]; then
|
||||
PRECHECK_PLAN_FILE="${PLAN_PREFIX}task_plan.md"
|
||||
else
|
||||
@@ -266,8 +287,9 @@ else
|
||||
fi
|
||||
[ -f "$PRECHECK_PLAN_FILE" ] || exit 0
|
||||
[ -L "$PRECHECK_PLAN_FILE" ] && exit 0
|
||||
PWF_PYTHON="$(select_explicit_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
is_within_root "$PRECHECK_PLAN_FILE" || exit 0
|
||||
PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
[ -n "$PWF_PYTHON" ] || PWF_PYTHON="$(select_python 2>/dev/null)" || PWF_PYTHON=""
|
||||
|
||||
# Session attachment is evaluated only after plan existence is proven. A
|
||||
# stale sessions directory without any plan must not cause interpreter probes.
|
||||
|
||||
@@ -140,14 +140,17 @@ if ($env:PLAN_ID) {
|
||||
}
|
||||
}
|
||||
|
||||
if (Test-Path -LiteralPath $activeFile) {
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem -and -not $activeItem.PSIsContainer -and
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -eq 0)) {
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
} else {
|
||||
$planId = $null
|
||||
# Get-Item observes the link object even when its target is missing, unlike
|
||||
# Test-Path which follows the target. An active pointer that is a directory or
|
||||
# reparse point is an unsafe/ambiguous selector and must terminate resolution;
|
||||
# falling through would silently select and expose the newest unrelated plan.
|
||||
$activeItem = Get-Item -LiteralPath $activeFile -Force -ErrorAction SilentlyContinue
|
||||
if ($activeItem) {
|
||||
if ($activeItem.PSIsContainer -or
|
||||
(($activeItem.Attributes -band [IO.FileAttributes]::ReparsePoint) -ne 0)) {
|
||||
exit 0
|
||||
}
|
||||
$planId = (Get-Content -LiteralPath $activeFile -Raw).Trim()
|
||||
if ($planId -and (Test-ValidSlug $planId)) {
|
||||
$candidate = Join-Path $PlanRoot $planId
|
||||
if ((Test-Path $candidate -PathType Container) -and (Test-WithinRoot $candidate)) {
|
||||
|
||||
@@ -90,10 +90,54 @@ norm_slashes() {
|
||||
done
|
||||
}
|
||||
|
||||
# Return true when a candidate path names the Microsoft Store WindowsApps
|
||||
# directory. Store app aliases are not stable interpreter binaries and may
|
||||
# present as executable while refusing script execution. Matching is
|
||||
# case-insensitive and works before or after Windows slash normalization.
|
||||
is_windowsapps_path() {
|
||||
norm_slashes "$1"
|
||||
case "${NORM_OUT}" in
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]|\
|
||||
*/[Ww][Ii][Nn][Dd][Oo][Ww][Ss][Aa][Pp][Pp][Ss]/*) return 0 ;;
|
||||
esac
|
||||
return 1
|
||||
}
|
||||
|
||||
# Select only an interpreter path the caller explicitly trusted.
|
||||
# PWF_TRUSTED_PYTHON is preferred; PYTHON_BIN remains a compatibility alias.
|
||||
# PATH discovery is intentionally forbidden because resolver hooks can run in
|
||||
# repositories that control PATH. Windows-native absolute paths are converted
|
||||
# with Git Bash's fixed system cygpath, never a PATH-selected shim.
|
||||
trusted_python() {
|
||||
for _tp_candidate in "${PWF_TRUSTED_PYTHON:-}" "${PYTHON_BIN:-}"; do
|
||||
[ -n "${_tp_candidate}" ] || continue
|
||||
case "${_tp_candidate}" in
|
||||
\\\\*|//*) continue ;;
|
||||
[A-Za-z]:[\\/]*)
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
_tp_cygpath="/usr/bin/cygpath.exe"
|
||||
[ -f "${_tp_cygpath}" ] && [ -x "${_tp_cygpath}" ] || continue
|
||||
_tp_candidate="$("${_tp_cygpath}" -u "${_tp_candidate}" 2>/dev/null)" \
|
||||
|| continue
|
||||
;;
|
||||
/*) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
is_windowsapps_path "${_tp_candidate}" && continue
|
||||
[ -f "${_tp_candidate}" ] || continue
|
||||
[ -x "${_tp_candidate}" ] || continue
|
||||
printf "%s\n" "${_tp_candidate}"
|
||||
return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# Portable path canonicalizer. realpath first (Linux, modern coreutils),
|
||||
# then readlink -f (older GNU), then python3/python os.path.realpath. Prints
|
||||
# the canonical absolute path on success; prints nothing and returns 1 on a
|
||||
# full miss so the caller can decide what to do. No python spawn on the happy
|
||||
# then readlink -f (older GNU), then an explicitly trusted Python interpreter.
|
||||
# Prints the canonical absolute path on success; prints nothing and returns 1
|
||||
# on a full miss so containment fails closed. No Python spawn on the happy
|
||||
# path: realpath/readlink cover Linux, WSL, Git-Bash, and modern macOS.
|
||||
canonicalize() {
|
||||
target="$1"
|
||||
@@ -105,12 +149,9 @@ canonicalize() {
|
||||
out="$(readlink -f "${target}" 2>/dev/null)" && [ -n "${out}" ] && {
|
||||
printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
_canonical_python="$(trusted_python)" || _canonical_python=""
|
||||
if [ -n "${_canonical_python}" ]; then
|
||||
out="$("${_canonical_python}" -c "import os,sys;print(os.path.realpath(sys.argv[1]))" "${target}" 2>/dev/null)" \
|
||||
&& [ -n "${out}" ] && { printf "%s\n" "${out}"; return 0; }
|
||||
fi
|
||||
return 1
|
||||
@@ -180,7 +221,8 @@ is_within_root() {
|
||||
}
|
||||
|
||||
# Portable mtime resolver. Tries GNU stat, BSD stat, BSD/macOS date -r,
|
||||
# python3, then perl. Returns "0" on full miss so callers can sort.
|
||||
# then an explicitly trusted Python interpreter. Returns "0" on a full miss
|
||||
# so newest-plan selection fails closed instead of executing from PATH.
|
||||
mtime_of() {
|
||||
target="$1"
|
||||
out="$(stat -c '%Y' "${target}" 2>/dev/null)"
|
||||
@@ -189,16 +231,9 @@ mtime_of() {
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
out="$(date -r "${target}" +%s 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
if command -v python3 >/dev/null 2>&1; then
|
||||
out="$(python3 -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v python >/dev/null 2>&1; then
|
||||
out="$(python -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
out="$(perl -e 'print((stat shift)[9])' "${target}" 2>/dev/null)"
|
||||
_mtime_python="$(trusted_python)" || _mtime_python=""
|
||||
if [ -n "${_mtime_python}" ]; then
|
||||
out="$("${_mtime_python}" -c "import os,sys;print(int(os.stat(sys.argv[1]).st_mtime))" "${target}" 2>/dev/null)"
|
||||
if [ -n "${out}" ]; then printf "%s\n" "${out}"; return 0; fi
|
||||
fi
|
||||
printf "0\n"
|
||||
|
||||
@@ -28,7 +28,7 @@ hooks:
|
||||
- type: command
|
||||
command: "[ -n \"${CLAUDE_PLUGIN_ROOT:-}\" ] && exit 0; SH=\"${CLAUDE_SKILL_DIR}/scripts/inject-plan.sh\"; [ -f \"$SH\" ] || SH=$(ls \"$HOME/.claude/skills/planning-with-files/scripts/inject-plan.sh\" \"$HOME/.claude/plugins/marketplaces/planning-with-files/scripts/inject-plan.sh\" 2>/dev/null | head -1); [ -n \"$SH\" ] && [ -f \"$SH\" ] && sh \"$SH\" --context=precompact; exit 0"
|
||||
metadata:
|
||||
version: "3.12.0"
|
||||
version: "3.12.1"
|
||||
---
|
||||
|
||||
# Planning with Files
|
||||
|
||||
@@ -32,6 +32,9 @@ param(
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$script:IsWindowsHost = [Environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
|
||||
if (-not $script:IsWindowsHost) {
|
||||
throw "Safe no-follow descriptor operations are unavailable in this PowerShell script on Unix. Use scripts/attest-plan.sh instead."
|
||||
}
|
||||
if ($script:IsWindowsHost -and -not ("PwfAttestationNative" -as [type])) {
|
||||
Add-Type -TypeDefinition @'
|
||||
using System;
|
||||
@@ -382,6 +385,21 @@ function Resolve-ContainedPlanFile {
|
||||
} catch { return $null }
|
||||
}
|
||||
|
||||
function Test-SlugPlanDirectory {
|
||||
param([string] $Directory)
|
||||
try {
|
||||
$finalDirectory = [PwfAttestationNative]::FinalDirectoryPath($Directory)
|
||||
} catch {
|
||||
return $false
|
||||
}
|
||||
$planningDirectory = Split-Path -Parent $finalDirectory
|
||||
$planId = Split-Path -Leaf $finalDirectory
|
||||
return (
|
||||
(Split-Path -Leaf $planningDirectory) -eq ".planning" -and
|
||||
$planId -match '^[A-Za-z0-9_][A-Za-z0-9._-]*$'
|
||||
)
|
||||
}
|
||||
|
||||
function Resolve-PlanFile {
|
||||
$resolver = Join-Path $PSScriptRoot "resolve-plan-dir.ps1"
|
||||
if (-not (Test-Path -LiteralPath $resolver -PathType Leaf)) { return $null }
|
||||
@@ -395,10 +413,17 @@ function Resolve-PlanFile {
|
||||
# fall through and attest an unrelated legacy-root plan.
|
||||
if ($env:PWF_PLAN_ROOT -or $env:PLAN_ID) { return $null }
|
||||
$activePointer = Join-Path (Join-Path (Get-Location) ".planning") ".active_plan"
|
||||
if (Test-Path -LiteralPath $activePointer) { return $null }
|
||||
$activePointerItem = Get-Item -LiteralPath $activePointer -Force -ErrorAction SilentlyContinue
|
||||
if ($activePointerItem) { return $null }
|
||||
|
||||
$legacy = Join-Path (Get-Location) "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory (Get-Location).Path)
|
||||
$currentDirectory = (Get-Location).Path
|
||||
if (Test-SlugPlanDirectory $currentDirectory) {
|
||||
$slugPlan = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $slugPlan -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
$legacy = Join-Path $currentDirectory "task_plan.md"
|
||||
return (Resolve-ContainedPlanFile -Candidate $legacy -ExpectedDirectory $currentDirectory)
|
||||
}
|
||||
|
||||
function Get-AttestationPath {
|
||||
@@ -406,6 +431,9 @@ function Get-AttestationPath {
|
||||
$planDir = Split-Path -Parent $PlanFile
|
||||
$cwd = (Get-Location).Path
|
||||
if ($planDir -eq $cwd) {
|
||||
if (Test-SlugPlanDirectory $cwd) {
|
||||
return (Join-Path $cwd ".attestation")
|
||||
}
|
||||
return (Join-Path $cwd ".plan-attestation")
|
||||
}
|
||||
return (Join-Path $planDir ".attestation")
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user