@chinhae/atw-cli 0.2.6 → 0.2.7

package/dist/migrations/manifests/0.2.7.json

@@ -0,0 +1,9 @@
+{
+  "version": "0.2.7",
+  "description": "Active-task pointers are no longer borrowed by count (#608 upstream); the Pi extension inherits a pointer only through the window's own session lineage and tells a fresh window to bind the sole in-progress task instead of asking.",
+  "breaking": false,
+  "recommendMigrate": false,
+  "changelog": "resolve_active_task() no longer treats a sole runtime session file as proof of ownership: allow_single_session_fallback defaults to False and only inject-subagent-context.py opts in, because copilot/gemini/qoder child agents cannot inherit a parent session id (mirrors upstream Trellis #608). Main sessions on every platform therefore see no active task until task.py start binds the window. The Pi extension now moves the previous session's pointer to the new session when session_start reports reason=new or fork with a previousSessionFile — the lineage Pi itself declares for /clear and fork — so a /clear in the same window keeps its task without counting pointer files or trusting key prefixes (#512 holds). Its startup <ready> block also tells a fresh window with exactly one implement/accept-stage task assigned to the developer to run task.py start for it rather than asking whether to create a task, and to ask when several qualify or the only candidate is still in planning.",
+  "migrations": [],
+  "notes": "No migration required. Changed files are all tracked by atw update: .atw/scripts/common/active_task.py, the shared inject-subagent-context.py hook under each platform directory, and .pi/extensions/atw/index.ts. Expect one explicit task.py start per new window on every platform from now on; a Pi /clear keeps the binding automatically."
+}

package/dist/templates/atw/scripts/common/active_task.py

@@ -648,17 +648,15 @@ def resolve_active_task(
     platform_input: dict[str, Any] | None = None,
     platform: str | None = None,
     *,
-    allow_single_session_fallback: bool = True,
+    allow_single_session_fallback: bool = False,
     allow_environment_context: bool = True,
 ) -> ActiveTask:
     """Resolve the active task from session runtime state only.
 
-    A stale session task is returned as stale. Missing context identity or a
-    missing/empty session context falls back to single-session inference: if
-    exactly one session file exists in the runtime, return its task with
-    source_type="session-fallback" — covers pull-based platform sub-agents
-    (copilot, gemini, qoder) that don't inherit the parent's session id. ≥2
-    files or 0 files yield ActiveTask(None) — refuses to guess across windows.
+    A stale session task is returned as stale.
+    Missing or unmatched session identity does not infer ownership from the
+    number of session files. Pull-based child-agent callers that cannot inherit
+    a parent identity must opt into the compatibility fallback explicitly.
     """
     context_key = resolve_context_key(
         platform_input,

package/dist/templates/pi/extensions/atw/index.ts.txt

@@ -1,4 +1,13 @@
-import { existsSync, readFileSync, realpathSync, statSync } from "node:fs";
+import {
+  closeSync,
+  existsSync,
+  openSync,
+  readFileSync,
+  readSync,
+  realpathSync,
+  renameSync,
+  statSync,
+} from "node:fs";
 import { createHash, randomBytes } from "node:crypto";
 import {
   delimiter,
@@ -1055,17 +1064,19 @@ function parseAgentFM(c: string): AgentConfig {
   return cfg;
 }
 
+function keyForSessionId(sessionId: string): string {
+  const normalized = sessionId.replace(/[^A-Za-z0-9._-]+/g, "_");
+  if (!normalized) return `pi_${hash(sessionId)}`;
+  return `pi_${normalized}${normalized === sessionId ? "" : `_${hash(sessionId)}`}`;
+}
+
 function contextKey(input?: unknown, ctx?: PiExtensionContext): string | null {
   const sessionId =
     callStr(ctx?.sessionManager?.getSessionId, ctx?.sessionManager) ??
     str(process.env.PI_SESSION_ID) ??
     str(process.env.PI_SESSIONID) ??
     lookupStr(input, ["session_id", "sessionId", "sessionID"]);
-  if (sessionId) {
-    const normalized = sessionId.replace(/[^A-Za-z0-9._-]+/g, "_");
-    if (!normalized) return `pi_${hash(sessionId)}`;
-    return `pi_${normalized}${normalized === sessionId ? "" : `_${hash(sessionId)}`}`;
-  }
+  if (sessionId) return keyForSessionId(sessionId);
   const transcriptPath =
     callStr(ctx?.sessionManager?.getSessionFile, ctx?.sessionManager) ??
     lookupStr(input, ["transcript_path", "transcriptPath", "transcript"]);
@@ -1117,6 +1128,55 @@ function readTaskDir(root: string, key: string | null): string | null {
   }
 }
 
+// ── Session lineage ───────────────────────────────────────────────────
+// 只读 pi 会话文件的首行头部拿会话 id；会话文件可能很大，不整读。
+function readSessionHeaderId(sessionFile: string): string | null {
+  let fd: number | null = null;
+  try {
+    fd = openSync(sessionFile, "r");
+    const buf = Buffer.alloc(65536);
+    const n = readSync(fd, buf, 0, buf.length, 0);
+    const line = buf.toString("utf-8", 0, n).split("\n")[0] ?? "";
+    const header = JSON.parse(line) as JsonObject;
+    return header.type === "session" ? str(header.id) : null;
+  } catch {
+    return null;
+  } finally {
+    if (fd !== null) closeSync(fd);
+  }
+}
+
+// 同一窗口用 /clear（reason=new）或 fork 换出新会话时，把前一个会话的活动任务指针
+// 搬到新会话名下。只认 pi 在 session_start 事件里给出的 previousSessionFile 这条
+// 明确血缘，不看运行时目录里有几个指针、也不看前缀（#512）。新开的窗口
+// （reason=startup）没有前身，什么都不继承。搬移而非复制，避免 /clear 链条堆积指针。
+function inheritSessionPointer(
+  root: string,
+  key: string | null,
+  event: unknown,
+): boolean {
+  if (!key || !isObj(event)) return false;
+  const reason = str(event.reason);
+  const previous = str(event.previousSessionFile);
+  if ((reason !== "new" && reason !== "fork") || !previous) return false;
+  const parentId = readSessionHeaderId(previous);
+  if (!parentId) return false;
+  const parentKey = keyForSessionId(parentId);
+  if (parentKey === key) return false;
+  const dir = join(root, ".atw", ".runtime", "sessions");
+  const ownPath = join(dir, `${key}.json`);
+  const parentPath = join(dir, `${parentKey}.json`);
+  try {
+    if (existsSync(ownPath) || !existsSync(parentPath)) return false;
+    const ctx = JSON.parse(readText(parentPath)) as JsonObject;
+    if (!str(ctx.current_task)) return false;
+    renameSync(parentPath, ownPath);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 // ── Workflow State Breadcrumb ─────────────────────────────────────────
 const WF_RE =
   /\[workflow-state:([A-Za-z0-9_-]+)\]\s*\n([\s\S]*?)\n\s*\[\/workflow-state:\1\]/g;
@@ -1194,7 +1254,13 @@ function buildStartupContext(
     FIRST_REPLY_NOTICE,
     overview,
     workflow,
-    "<ready>\nUse the current workflow state to decide whether to create, continue, or skip an ATW task.\n</ready>",
+    [
+      "<ready>",
+      "Use the current workflow state to decide whether to create, continue, or skip an ATW task.",
+      "When CURRENT TASK is (none) but ACTIVE TASKS lists exactly one task assigned to you that is already at the implement or accept stage, this window is merely not bound to it yet: run `python3 ./.atw/scripts/task.py start <task-dir>` for that task, then continue from its stage. Do not ask whether to create a new task in that case.",
+      "If several tasks qualify, or the only candidate is still in a planning stage (discover / specify / slice), ask which task to bind instead of running start: start moves a planning-stage task straight into implement.",
+      "</ready>",
+    ].join("\n"),
   ]
     .filter(Boolean)
     .join("\n\n");
@@ -1916,7 +1982,8 @@ export default function atwExtension(pi: {
 
   // Events
   pi.on?.("session_start", (event, ctx) => {
-    getKey(event, ctx);
+    const k = getKey(event, ctx);
+    inheritSessionPointer(resolveRoot(ctx), k, event);
     ctx?.ui?.notify?.(
       "ATW project context is available. Use /atw-start to bootstrap or /atw-continue to resume.",
       "info",

package/dist/templates/shared-hooks/inject-subagent-context.py

@@ -1093,7 +1093,11 @@ def main():
 
     # Get current task directory. May be None here — the AGENTS_REQUIRE_TASK
     # check below is what refuses to continue without one.
-    task_dir = get_current_task(repo_root, input_data)
+    task_dir = get_current_task(
+        repo_root,
+        input_data,
+        allow_single_session_fallback=True,
+    )
 
     # implement/check need task directory
     if subagent_type in AGENTS_REQUIRE_TASK:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chinhae/atw-cli",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "A Team Workflow — an AI coding workflow framework that encodes your team's conventions into the process",
   "type": "module",
   "main": "./dist/index.js",
@@ -33,7 +33,7 @@
     "inquirer": "^9.3.7",
     "undici": "^6.21.0",
     "zod": "^4.4.2",
-    "@chinhae/atw-core": "0.2.6"
+    "@chinhae/atw-core": "0.2.7"
   },
   "devDependencies": {
     "@eslint/js": "^9.18.0",