@fitlab-ai/agent-infra 0.8.5 → 0.9.1

package/dist/lib/task/commands/cat.js

@@ -1,10 +1,14 @@
 import fs from 'node:fs';
-import { resolveTaskRef } from '../resolve-ref.js';
+import { parseTaskScope } from '../command-options.js';
+import { resolveTaskContext } from '../resolve-ref.js';
 import { resolveArtifact } from '../artifacts.js';
-const USAGE = `Usage: ai task cat <N | #N | TASK-id> <artifact | N>
+const USAGE = `Usage: ai task cat <artifact | N>
+       ai task cat (--task <ref> | -t <ref>) <artifact | N>
+       ai task cat <ref> <artifact | N>
 
 Prints a task artifact's raw content to stdout.
-  <ref>            Bare numeric / '#N' short id, or a full TASK-YYYYMMDD-HHMMSS id.
+  One positional    Uses current task context and treats the operand as the artifact.
+  <ref>            Bare numeric short id, or a full TASK-YYYYMMDD-HHMMSS id.
   <artifact | N>   Artifact filename (with or without '.md'), or the number from 'ai task files'.
 `;
 function cat(args = []) {
@@ -12,12 +16,38 @@ function cat(args = []) {
         process.stdout.write(USAGE);
         return;
     }
-    if (args.length < 2) {
+    let scope;
+    try {
+        scope = parseTaskScope(args);
+    }
+    catch (error) {
+        process.stderr.write(`ai task cat: ${error instanceof Error ? error.message : String(error)}\n`);
+        process.exitCode = 1;
+        return;
+    }
+    let taskRef;
+    let artifact;
+    if (scope.explicit) {
+        if (scope.positionals.length !== 1) {
+            process.stdout.write(USAGE);
+            process.exitCode = 1;
+            return;
+        }
+        taskRef = scope.taskRef;
+        artifact = scope.positionals[0];
+    }
+    else if (scope.positionals.length === 1) {
+        artifact = scope.positionals[0];
+    }
+    else if (scope.positionals.length === 2) {
+        [taskRef, artifact] = scope.positionals;
+    }
+    else {
         process.stdout.write(USAGE);
         process.exitCode = 1;
         return;
     }
-    const resolved = resolveTaskRef(args[0]);
+    const resolved = resolveTaskContext(taskRef);
     if (!resolved.ok) {
         process.stderr.write(`ai task cat: ${resolved.message}\n`);
         process.exitCode = 1;
@@ -25,7 +55,7 @@ function cat(args = []) {
     }
     let artifactPath;
     try {
-        artifactPath = resolveArtifact(resolved.taskDir, args[1]);
+        artifactPath = resolveArtifact(resolved.taskDir, artifact);
     }
     catch (e) {
         process.stderr.write(`ai task cat: ${e.message}\n`);

package/dist/lib/task/commands/decisions.js

@@ -1,18 +1,23 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { formatTable } from '../../table.js';
-import { resolveTaskRef } from '../resolve-ref.js';
-import { parseLedger, HUMAN_DECISION_STATUSES } from '../ledger.js';
+import { parseTaskScope } from '../command-options.js';
+import { resolveTaskContext } from '../resolve-ref.js';
+import { isReviewStage, parseLedger } from '../ledger.js';
+import { listDecisionItems, selectDecisionItem } from '../decision-items.js';
 import { extractSubSection } from '../sections.js';
-const USAGE = `Usage: ai task decisions <N | #N | TASK-id> [selector] [options]
+const USAGE = `Usage: ai task decisions [--task <ref> | -t <ref>] [--item <selector> | -i <selector>] [options]
+       ai task decisions <ref> [selector] [options]
 
-Lists the human-decision (HD-) items recorded in a task's review disagreement
+Lists decision items recorded in a task's review disagreement
 ledger, or prints the full detail block for a single item. Read-only.
 
-  <ref>          Bare numeric / '#N' short id, or a full TASK-YYYYMMDD-HHMMSS id.
-  [selector]     Ordinal (1-based) or HD id (e.g. 'HD-3') to show one item's detail.
+  Omit <ref>     Resolve the unique active task for the current branch.
+  <ref>          Legacy positional task ref.
+  [selector]     Ordinal (1-based) or ledger id (e.g. 'PL-3') to show one item's detail.
 
 Options:
+  -i, --item <s>    Select an item when task scope is implicit or flag-based.
   --all              Include already-decided (human-decided) items, not just pending.
   --stage <s>        Filter to one stage: analysis | plan | code.
   --format <fmt>     Output format: text (default) | markdown.
@@ -20,9 +25,7 @@ Options:
 
 Aliased as 'ai task d'.
 `;
-const STAGES = new Set(['analysis', 'plan', 'code']);
 const FORMATS = new Set(['text', 'markdown']);
-const HD_ID_RE = /^HD-\d+$/;
 function fail(message) {
     process.stderr.write(`ai task decisions: ${message}\n`);
     process.exitCode = 1;
@@ -35,6 +38,30 @@ function parseArgs(args) {
         if (a === '--all') {
             out.all = true;
         }
+        else if (a === '--item' || a === '-i') {
+            const v = args[i + 1];
+            if (v === undefined) {
+                fail(`${a} requires a value`);
+                return null;
+            }
+            if (out.item !== undefined) {
+                fail("duplicate option '--item'");
+                return null;
+            }
+            out.item = v;
+            i += 1;
+        }
+        else if (a.startsWith('--item=')) {
+            if (out.item !== undefined) {
+                fail("duplicate option '--item'");
+                return null;
+            }
+            out.item = a.slice('--item='.length);
+            if (out.item === '') {
+                fail('--item requires a value');
+                return null;
+            }
+        }
         else if (a === '--stage') {
             const v = args[i + 1];
             if (v === undefined) {
@@ -78,7 +105,7 @@ function roundOf(file) {
     const m = /-r(\d+)\.md$/.exec(file);
     return m ? Number.parseInt(m[1], 10) : 1;
 }
-// Locate the `### HD-N` detail block for a row. Prefer the artifact named by the
+// Locate the `### {ledger-id}` detail block for a row. Prefer the artifact named by the
 // row's evidence anchor; otherwise scan analysis/plan/code artifacts and return
 // the block from the highest-round file that contains it. Returns '' when none
 // is found (caller degrades gracefully — plan B3).
@@ -112,12 +139,12 @@ function findDetailBlock(row, taskDir) {
     }
     return best;
 }
-// Pull the `## 人工裁决` record lines that mention this HD id, so a decided item
+// Pull the `## 人工裁决` record lines that mention this ledger id, so a decided item
 // shows the human's recorded ruling alongside its detail block.
 function findDecisionRecord(id, content) {
     const lines = content.split('\n');
     let i = 0;
-    while (i < lines.length && !/^##\s+(人工裁决|Human Decisions?)\s*$/.test(lines[i]))
+    while (i < lines.length && !/^##\s+(人工裁决|Human Rulings|Human Decisions?)\s*$/.test(lines[i]))
         i += 1;
     if (i >= lines.length)
         return [];
@@ -170,29 +197,12 @@ function renderList(rows, format, taskDir) {
     process.stdout.write(`${formatTable(headers, data).join('\n')}\n`);
 }
 function renderDetail(rows, selector, format, taskDir, content) {
-    let row;
-    if (/^\d+$/.test(selector)) {
-        const idx = Number.parseInt(selector, 10) - 1;
-        if (idx < 0 || idx >= rows.length) {
-            fail(`ordinal '${selector}' out of range (1..${rows.length})`);
-            return;
-        }
-        row = rows[idx];
-    }
-    else {
-        const want = selector.toUpperCase();
-        const matches = rows.filter((r) => r.id.toUpperCase() === want);
-        if (matches.length === 0) {
-            fail(`no decision item matches '${selector}'`);
-            return;
-        }
-        if (matches.length > 1) {
-            fail(`duplicate id '${selector}' in ledger; select by ordinal instead`);
-            return;
-        }
-        row = matches[0];
+    const selected = selectDecisionItem(rows, selector);
+    if (!selected.ok) {
+        fail(selected.message);
+        return;
     }
-    const r = row;
+    const r = selected.row;
     const block = findDetailBlock(r, taskDir);
     const lines = [];
     if (format === 'markdown') {
@@ -220,15 +230,18 @@ function decisions(args = []) {
         process.stdout.write(USAGE);
         return;
     }
-    const parsed = parseArgs(args);
-    if (!parsed)
-        return;
-    if (parsed.positionals.length === 0) {
-        process.stdout.write(USAGE);
-        process.exitCode = 1;
+    let scope;
+    try {
+        scope = parseTaskScope(args);
+    }
+    catch (error) {
+        fail(error instanceof Error ? error.message : String(error));
         return;
     }
-    if (parsed.stage !== undefined && !STAGES.has(parsed.stage)) {
+    const parsed = parseArgs(scope.positionals);
+    if (!parsed)
+        return;
+    if (parsed.stage !== undefined && !isReviewStage(parsed.stage)) {
         fail(`invalid --stage '${parsed.stage}' (expected analysis|plan|code)`);
         return;
     }
@@ -236,17 +249,38 @@ function decisions(args = []) {
         fail(`invalid --format '${parsed.format}' (expected text|markdown)`);
         return;
     }
-    const resolved = resolveTaskRef(parsed.positionals[0]);
+    let taskRef = scope.taskRef;
+    let selector = parsed.item;
+    if (parsed.item !== undefined) {
+        if (parsed.positionals.length > 0) {
+            fail('positional task ref/selector cannot be combined with --item');
+            return;
+        }
+    }
+    else if (scope.explicit) {
+        if (parsed.positionals.length > 0) {
+            fail('positional task ref/selector cannot be combined with --task');
+            return;
+        }
+    }
+    else {
+        if (parsed.positionals.length > 2) {
+            fail('too many positional arguments');
+            return;
+        }
+        taskRef = parsed.positionals[0];
+        selector = parsed.positionals[1];
+    }
+    const resolved = resolveTaskContext(taskRef);
     if (!resolved.ok) {
         fail(resolved.message);
         return;
     }
     const content = fs.readFileSync(resolved.taskMdPath, 'utf8');
-    let rows = parseLedger(content).filter((r) => HD_ID_RE.test(r.id));
-    rows = rows.filter((r) => parsed.all ? HUMAN_DECISION_STATUSES.has(r.status) : r.status === 'needs-human-decision');
-    if (parsed.stage !== undefined)
-        rows = rows.filter((r) => r.stage === parsed.stage);
-    const selector = parsed.positionals[1];
+    const rows = listDecisionItems(parseLedger(content), {
+        includeDecided: parsed.all,
+        stage: parsed.stage
+    });
     if (selector === undefined) {
         renderList(rows, parsed.format, resolved.taskDir);
     }

package/dist/lib/task/commands/files.js

@@ -1,10 +1,12 @@
 import { formatTable } from '../../table.js';
-import { resolveTaskRef } from '../resolve-ref.js';
+import { parseTaskScope } from '../command-options.js';
+import { resolveTaskContext } from '../resolve-ref.js';
 import { enumerateArtifacts } from '../artifacts.js';
-const USAGE = `Usage: ai task files <N | #N | TASK-id>
+const USAGE = `Usage: ai task files [<N | TASK-id> | --task <ref> | -t <ref>]
 
 Lists the artifacts in a task directory with stable numbers.
-  <ref>   Bare numeric / '#N' short id, or a full TASK-YYYYMMDD-HHMMSS id.
+  Omit <ref>   Resolve the unique active task for the current branch.
+  <ref>   Bare numeric short id, or a full TASK-YYYYMMDD-HHMMSS id.
 
 Columns: # (artifact number, usable with 'ai task cat') / NAME / SIZE (bytes) / MTIME
 `;
@@ -18,13 +20,25 @@ function formatMtime(mtimeMs) {
         `${pad2(d.getHours())}:${pad2(d.getMinutes())}:${pad2(d.getSeconds())}`);
 }
 function files(args = []) {
-    if (args.length === 0 || args[0] === '--help' || args[0] === '-h') {
+    if (args[0] === '--help' || args[0] === '-h') {
         process.stdout.write(USAGE);
-        if (args.length === 0)
-            process.exitCode = 1;
         return;
     }
-    const resolved = resolveTaskRef(args[0]);
+    let scope;
+    try {
+        scope = parseTaskScope(args);
+    }
+    catch (error) {
+        process.stderr.write(`ai task files: ${error instanceof Error ? error.message : String(error)}\n`);
+        process.exitCode = 1;
+        return;
+    }
+    if (scope.positionals.length > 1 || (scope.explicit && scope.positionals.length > 0)) {
+        process.stderr.write('ai task files: task ref must be provided once\n');
+        process.exitCode = 1;
+        return;
+    }
+    const resolved = resolveTaskContext(scope.taskRef ?? scope.positionals[0]);
     if (!resolved.ok) {
         process.stderr.write(`ai task files: ${resolved.message}\n`);
         process.exitCode = 1;

package/dist/lib/task/commands/grep.js

@@ -1,13 +1,14 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { resolveTaskRef, detectRepoRoot, enumerateTaskDirs } from '../resolve-ref.js';
+import { resolveTaskContext, resolveTaskRef, detectRepoRoot, enumerateTaskDirs } from '../resolve-ref.js';
 import { enumerateArtifacts, resolveArtifact } from '../artifacts.js';
 import { loadShortIdByTaskId } from '../short-id.js';
 const USAGE = `Usage: ai task grep <pattern> [ref] [artifact | N]
+       ai task grep <pattern> (--current | --task <ref> | -t <ref>) [artifact | N]
 
 Literal (non-regex) line search across task artifacts.
   <pattern>          Literal substring to match (NOT a regex). Case-sensitive by default.
-  [ref]              Bare numeric / '#N' short id, or a full TASK-YYYYMMDD-HHMMSS id.
+  [ref]              Bare numeric short id, or a full TASK-YYYYMMDD-HHMMSS id.
                      Omit to scan every task under active / blocked / completed
                      (archive is skipped). With a ref, narrows to that single task
                      (a TASK-id ref can also resolve an archived task).
@@ -16,6 +17,8 @@ Literal (non-regex) line search across task artifacts.
 
 Options:
   -i, --ignore-case  Case-insensitive matching.
+  --current          Limit search to the current task context.
+  -t, --task <ref>   Limit search to an explicit task.
   --                 Treat the rest as positional (use for patterns starting with '-').
 
 Output: '{taskId} [#short] {fileStem}:{line}: {matched-line}' (short id only for active tasks).
@@ -52,8 +55,11 @@ function scanArtifact(taskId, shortToken, artifactPath, matcher, emit) {
 function grep(args = []) {
     const positional = [];
     let ignoreCase = false;
+    let current = false;
+    let taskRef;
     let optsEnded = false;
-    for (const a of args) {
+    for (let index = 0; index < args.length; index += 1) {
+        const a = args[index];
         if (!optsEnded && a === '--') {
             optsEnded = true;
             continue;
@@ -66,6 +72,39 @@ function grep(args = []) {
             ignoreCase = true;
             continue;
         }
+        if (!optsEnded && a === '--current') {
+            current = true;
+            continue;
+        }
+        if (!optsEnded && (a === '--task' || a === '-t')) {
+            if (taskRef !== undefined) {
+                process.stderr.write("ai task grep: duplicate option '--task'\n");
+                process.exitCode = 1;
+                return;
+            }
+            const value = args[++index];
+            if (!value || value.startsWith('-')) {
+                process.stderr.write(`ai task grep: ${a} requires a value\n`);
+                process.exitCode = 1;
+                return;
+            }
+            taskRef = value;
+            continue;
+        }
+        if (!optsEnded && a.startsWith('--task=')) {
+            if (taskRef !== undefined) {
+                process.stderr.write("ai task grep: duplicate option '--task'\n");
+                process.exitCode = 1;
+                return;
+            }
+            taskRef = a.slice('--task='.length);
+            if (taskRef === '') {
+                process.stderr.write('ai task grep: --task requires a value\n');
+                process.exitCode = 1;
+                return;
+            }
+            continue;
+        }
         if (!optsEnded && a.startsWith('-') && a !== '-') {
             process.stderr.write(`ai task grep: unknown flag: ${a}\n`);
             process.exitCode = 1;
@@ -78,17 +117,26 @@ function grep(args = []) {
         process.exitCode = 1;
         return;
     }
-    if (positional.length > 3) {
+    if (current && taskRef !== undefined) {
+        process.stderr.write('ai task grep: --current and --task are mutually exclusive\n');
+        process.exitCode = 1;
+        return;
+    }
+    if (positional.length > 3 || ((current || taskRef !== undefined) && positional.length > 2)) {
         process.stderr.write('ai task grep: too many arguments\n');
         process.exitCode = 1;
         return;
     }
-    const [pattern, ref, artifactOrN] = positional;
+    let [pattern, ref, artifactOrN] = positional;
+    if (current || taskRef !== undefined) {
+        artifactOrN = ref;
+        ref = taskRef;
+    }
     const matcher = makeMatcher(pattern, ignoreCase);
     const chunks = [];
     const emit = (line) => chunks.push(line);
     let total = 0;
-    if (ref === undefined) {
+    if (ref === undefined && !current) {
         // No ref: full scan across active / blocked / completed (no archive).
         let repoRoot;
         try {
@@ -108,7 +156,7 @@ function grep(args = []) {
         }
     }
     else {
-        const resolved = resolveTaskRef(ref);
+        const resolved = current ? resolveTaskContext() : resolveTaskRef(ref);
         if (!resolved.ok) {
             process.stderr.write(`ai task grep: ${resolved.message}\n`);
             process.exitCode = 1;

package/dist/lib/task/commands/issue-body.js

@@ -1,18 +1,21 @@
 import fs from 'node:fs';
-import { resolveTaskRef } from '../resolve-ref.js';
+import { parseTaskScope } from '../command-options.js';
+import { resolveTaskContext } from '../resolve-ref.js';
 import { extractTitle } from '../frontmatter.js';
 import { extractSection, findSectionHeading } from '../sections.js';
 import { renderTemplateBody, PLACEHOLDER } from '../issue-form.js';
-const USAGE = `Usage: ai task issue-body <N | #N | TASK-id> [--template <path>]
+const USAGE = `Usage: ai task issue-body [<ref> | --task <ref> | -t <ref>] [--template <path>]
 
 Print a deterministic Issue body extracted from a task's task.md.
-  <ref>               Bare numeric / '#N' short id, or a full TASK-YYYYMMDD-HHMMSS id.
+  Omit <ref>           Resolve the unique active task for the current branch.
+  <ref>               Bare numeric short id, or a full TASK-YYYYMMDD-HHMMSS id.
   --template <path>   Render the final body for the given GitHub Issue Form (scenario A);
-                      without it, print the default '描述 + 需求' body (scenario B).
+                      without it, print the default '任务输入 + 描述 + 需求' body (scenario B).
 
-Only the task title, '## 描述' and '## 需求' sections are ever emitted; the rest of
-task.md (scaffolding sections, placeholders) is never written to the body.
+Only the task title, '## 任务输入', '## 描述' and '## 需求' sections are ever
+emitted; the rest of task.md is never written to the body.
 `;
+const TASK_INPUT_ALIASES = ['任务输入', 'Task Input'];
 const DESCRIPTION_ALIASES = ['描述', 'Description'];
 const REQUIREMENTS_ALIASES = ['需求', 'Requirements'];
 /**
@@ -20,49 +23,60 @@ const REQUIREMENTS_ALIASES = ['需求', 'Requirements'];
  * task.md actually uses, with empty sections falling back to `N/A`.
  */
 function buildDefaultBody(content) {
+    const taskInputHeading = findSectionHeading(content, TASK_INPUT_ALIASES);
     const descHeading = findSectionHeading(content, DESCRIPTION_ALIASES);
     const reqHeading = findSectionHeading(content, REQUIREMENTS_ALIASES);
+    const taskInput = extractSection(content, TASK_INPUT_ALIASES) || PLACEHOLDER;
     const description = extractSection(content, DESCRIPTION_ALIASES) || PLACEHOLDER;
     const requirements = extractSection(content, REQUIREMENTS_ALIASES) || PLACEHOLDER;
-    return `## ${descHeading}\n\n${description}\n\n## ${reqHeading}\n\n${requirements}\n`;
+    return `## ${taskInputHeading}\n\n${taskInput}\n\n## ${descHeading}\n\n${description}\n\n## ${reqHeading}\n\n${requirements}\n`;
 }
 function readTaskFields(content) {
     return {
         title: extractTitle(content),
         description: extractSection(content, DESCRIPTION_ALIASES),
-        requirements: extractSection(content, REQUIREMENTS_ALIASES)
+        requirements: extractSection(content, REQUIREMENTS_ALIASES),
+        taskInput: extractSection(content, TASK_INPUT_ALIASES),
+        taskInputHeading: findSectionHeading(content, TASK_INPUT_ALIASES)
     };
 }
 function issueBody(args = []) {
-    if (args.length === 0 || args[0] === '--help' || args[0] === '-h') {
+    if (args[0] === '--help' || args[0] === '-h') {
         process.stdout.write(USAGE);
-        if (args.length === 0)
-            process.exitCode = 1;
         return;
     }
-    let ref;
     let templatePath;
+    const scopeArgs = [];
     for (let i = 0; i < args.length; i += 1) {
         const arg = args[i];
         if (arg === '--template') {
             templatePath = args[i + 1];
             i += 1;
         }
-        else if (ref === undefined) {
-            ref = arg;
+        else {
+            scopeArgs.push(arg);
         }
     }
-    if (!ref) {
-        process.stderr.write('ai task issue-body: missing task ref\n');
+    if (templatePath === undefined && args.includes('--template')) {
+        process.stderr.write('ai task issue-body: --template requires a path\n');
         process.exitCode = 1;
         return;
     }
-    if (templatePath === undefined && args.includes('--template')) {
-        process.stderr.write('ai task issue-body: --template requires a path\n');
+    let scope;
+    try {
+        scope = parseTaskScope(scopeArgs);
+    }
+    catch (error) {
+        process.stderr.write(`ai task issue-body: ${error instanceof Error ? error.message : String(error)}\n`);
+        process.exitCode = 1;
+        return;
+    }
+    if (scope.positionals.length > 1 || (scope.explicit && scope.positionals.length > 0)) {
+        process.stderr.write('ai task issue-body: task ref must be provided once\n');
         process.exitCode = 1;
         return;
     }
-    const resolved = resolveTaskRef(ref);
+    const resolved = resolveTaskContext(scope.taskRef ?? scope.positionals[0]);
     if (!resolved.ok) {
         process.stderr.write(`ai task issue-body: ${resolved.message}\n`);
         process.exitCode = 1;