amicus 4.6.3 → 4.7.0

package/src/utils/session-metadata-tmp-sweep.js

@@ -29,6 +29,14 @@
  * symlinked taskId or subagents directory could otherwise be traversed and
  * have files unlinked through the link, effectively outside the sessions
  * root; lstat closes that off at zero cost.
+ *
+ * Consequence of the SR-3 isFile() gate (listTmpIn, below): a SYMLINK whose
+ * basename matches the tmp pattern is now excluded from the list entirely —
+ * neither swept nor reported. Before SR-3 it was swept (unlink removes the
+ * link, never the target — a safe success). Deliberate: this module's
+ * never-follow policy applies to the entries it unlinks too. Note the sibling
+ * session-index-tmp-sweep.js diverges here — it uses statSync, so a
+ * symlink-to-a-file with the matching name IS still swept there.
  */
 
 const fs = require('fs');
@@ -38,7 +46,14 @@ const HINTS = require('./remediation-hints');
 /** Files older than this survive to the next --fix, never a live writer's ms-lived tmp. */
 const AGE_THRESHOLD_MS = 60 * 1000;
 
-/** The cwd-scoped sessions root: <cwd>/.claude/amicus_sessions. */
+/**
+ * The cwd-scoped sessions root: <cwd>/.claude/amicus_sessions.
+ * Reads process.cwd() directly, NOT doctor's injected getCwd
+ * (cli-handlers-doctor.js's realDeps().getCwd) — the
+ * listSessionMetadataTmpFiles/unlinkSessionMetadataTmp deps are wired
+ * argument-free in that same realDeps(), so that seam does not reach here.
+ * Thread cwd through those deps if a `doctor --cwd <dir>` mode ever lands.
+ */
 function sessionsRoot() {
   const { SESSIONS_DIR } = require('../session-manager');
   return path.join(process.cwd(), '.claude', SESSIONS_DIR);
@@ -56,9 +71,9 @@ function listTmpIn(dir, root) {
   return entries
     .filter(isMetadataTmp)
     .map((basename) => {
-      let mtimeMs = null;
-      try { mtimeMs = fs.lstatSync(path.join(dir, basename)).mtimeMs; } catch { /* raced away — skip below */ }
-      return { name: path.relative(root, path.join(dir, basename)), mtimeMs };
+      let st = null;
+      try { st = fs.lstatSync(path.join(dir, basename)); } catch { /* raced away */ }
+      return { name: path.relative(root, path.join(dir, basename)), mtimeMs: st && st.isFile() ? st.mtimeMs : null };
     })
     .filter((f) => f.mtimeMs !== null);
 }
@@ -107,6 +122,11 @@ function unlinkSessionMetadataTmp(name) {
  * wraps this in guard() the same way it wires the sibling sessions-index-tmp check.
  * @param {{listSessionMetadataTmpFiles: () => Array<{name:string, mtimeMs:number}>,
  *   fix?: boolean, now: () => number, unlinkSessionMetadataTmp: (name: string) => void}} d
+ * The four `message` strings below are byte-identical to the index sibling's
+ * (session-index-tmp-sweep.js's evaluateSessionIndexTmpSweep, same four
+ * ok/warn returns) on purpose — `id`/`name` and the `fixDetail` wording are
+ * the only disambiguators between the two rows. Reword one side and the
+ * pairing silently breaks: reword both, or neither.
  */
 function evaluateSessionMetadataTmpSweep(d) {
   const id = 'session-metadata-tmp'; const name = 'Session metadata tmp files';

package/src/utils/spend-ledger.js

@@ -55,13 +55,17 @@ const SPEND_LEDGER_FILE = 'spend-ledger.jsonl';
  * @param {string} [opts.councilName] council name (additive attribution)
  * @param {string} [opts.project] project directory (additive attribution)
  * @param {string} [opts.gateway] resolved gateway ('direct'|'openrouter'|'local', additive attribution)
+ * @param {string} [opts.tag] user-chosen tag (v4.7 F8 D16, additive attribution) —
+ *   nullable dim, same null-not-absent convention as councilRunId/project below;
+ *   deliberately the OPPOSITE convention from createSessionMetadata's tag (D13,
+ *   absent-not-null) — see the dim-list comment below.
  * @param {number} [opts.attempt] fallback attempt count (omitted if absent)
  * @param {string} [opts.substitutedFor] substituted model (omitted if absent)
  * @param {string} [opts.retryOfWaveId] wave id being retried (omitted if absent)
  * @param {{dir?:string}} [ctx] test seam — dir overrides getConfigDir()
  */
 function appendSpend({ taskId, waveId, model, mode, usage,
-  op, status, councilRunId, councilName, project, gateway,
+  op, status, councilRunId, councilName, project, gateway, tag,
   attempt, substitutedFor, retryOfWaveId }, ctx = {}) {
   if (!usage) { return; }
   try {
@@ -76,15 +80,18 @@ function appendSpend({ taskId, waveId, model, mode, usage,
       mode: mode || null,
       tokens: usage.tokens || null,
       cost: usage.cost || null,
-      // v4.3 additive attribution (spec 7.1). Nullable dimensions default to
-      // null (so a row is always groupable); linkage fields are OMITTED unless
-      // present (they only exist on fallback/retry rows).
+      // v4.3 additive attribution (spec 7.1), extended v4.7 F8 D16 with `tag`.
+      // Nullable dimensions (op/status/councilRunId/councilName/project/
+      // gateway/tag) default to null (so a row is always groupable); linkage
+      // fields are OMITTED unless present (they only exist on fallback/retry
+      // rows).
       op: op || null,
       status: status || null,
       councilRunId: councilRunId || null,
       councilName: councilName || null,
       project: project || null,
       gateway: gateway || null,
+      tag: tag || null,
     };
     if (attempt !== undefined) { row.attempt = attempt; }
     if (substitutedFor !== undefined) { row.substitutedFor = substitutedFor; }

package/src/utils/validators.js

@@ -24,6 +24,20 @@ const { PROVIDER_KEY_MAP } = require('./provider-registry');
 /** Task ID format: alphanumeric, hyphens, underscores, 1-64 chars */
 const TASK_ID_PATTERN = /^[a-zA-Z0-9_-]{1,64}$/;
 
+const TAG_PATTERN = /^[a-zA-Z0-9_-]{1,64}$/;
+/**
+ * v4.7 F8 (D13): tag validation REJECTS (unlike sanitizeCouncilName, which
+ * cleans) — a stored tag is a user-chosen search key, so silent truncation
+ * or charset-stripping would make `--search`/`--group-by tag` miss it.
+ * Non-string guards the valueless `--tag` parse (cli.js turns it into true).
+ */
+function validateTag(value) {
+  if (typeof value !== 'string' || !TAG_PATTERN.test(value)) {
+    return { ok: false, error: 'Invalid --tag: 1-64 chars, letters/digits/_/- only' };
+  }
+  return { ok: true, tag: value };
+}
+
 /**
  * Validate a task ID format (safe for use in file paths)
  * @param {string} taskId
@@ -249,6 +263,8 @@ module.exports = {
   MODEL_THINKING_SUPPORT,
   TASK_ID_PATTERN,
   validateTaskId,
+  TAG_PATTERN,
+  validateTag,
   safeSessionDir,
   validatePromptContent,
   validateCwdPath,