@tacuchi/agent-workflow-cli 20.22.0 → 20.23.0

package/dist/application/session-binding-service.js

@@ -0,0 +1,125 @@
+import { createHash } from "node:crypto";
+/**
+ * Durable conversation→session association.
+ *
+ * The registry lives at `.workflow/sessions/.bindings.json` — machine-local
+ * state, gitignored along with the sessions dir. Keys are the SHA-256 of the
+ * host's opaque conversation id (the raw id is NEVER persisted); values are
+ * canonical session folder names.
+ *
+ * Every function here is **lock-free**: the caller owns the workspace lock so
+ * one operation = one lock boundary (no nested acquisition). Reads are safe
+ * without the lock because `writeText` renames atomically onto the path.
+ *
+ * Validation is manual (DEC-001: no Zod) and **fail-closed**: an unreadable,
+ * malformed or unknown-version registry is reported as invalid and never
+ * overwritten — repairing it automatically would silently drop associations.
+ */
+/** Only this schema version is accepted. */
+export const BINDINGS_VERSION = 1;
+/** SHA-256 of the opaque conversation id — the only form that reaches disk. */
+export function hashContextId(contextId) {
+    return createHash("sha256").update(contextId, "utf8").digest("hex");
+}
+function parseBindingRegistry(raw) {
+    if (raw.trim().length === 0)
+        return { ok: true, registry: emptyRegistry() };
+    let parsed;
+    try {
+        parsed = JSON.parse(raw);
+    }
+    catch {
+        return { ok: false, reason: "el registro de bindings no es JSON válido" };
+    }
+    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+        return { ok: false, reason: "el registro de bindings no es un objeto JSON" };
+    }
+    const { version, bindings } = parsed;
+    if (version !== BINDINGS_VERSION) {
+        return { ok: false, reason: `versión de registro no soportada: ${String(version)}` };
+    }
+    if (typeof bindings !== "object" || bindings === null || Array.isArray(bindings)) {
+        return { ok: false, reason: "el campo 'bindings' no es un mapa" };
+    }
+    const entries = {};
+    for (const [key, value] of Object.entries(bindings)) {
+        if (key.length === 0 || typeof value !== "string" || value.length === 0) {
+            return { ok: false, reason: `entrada de binding inválida en la clave '${key}'` };
+        }
+        entries[key] = value;
+    }
+    return { ok: true, registry: { version: BINDINGS_VERSION, bindings: entries } };
+}
+export async function readBindingRegistry(fs, paths) {
+    const path = paths.cwdSessionBindingsFile();
+    if (!(await fs.exists(path)))
+        return { ok: true, registry: emptyRegistry() };
+    let raw;
+    try {
+        raw = await fs.readText(path);
+    }
+    catch {
+        return { ok: false, reason: `no se pudo leer el registro de bindings (${path})` };
+    }
+    return parseBindingRegistry(raw);
+}
+/** Which session this conversation is associated with, if any. */
+export async function lookupBinding(fs, paths, contextId) {
+    const read = await readBindingRegistry(fs, paths);
+    if (!read.ok)
+        return { status: "invalid", reason: read.reason };
+    const folder = read.registry.bindings[hashContextId(contextId)];
+    return folder === undefined ? { status: "unbound" } : { status: "bound", folder };
+}
+/**
+ * Associate this conversation with `folder`, replacing only its own entry.
+ * `changed: false` when the association already pointed there (no write).
+ */
+export async function bindContextToSession(fs, paths, contextId, folder) {
+    const read = await readBindingRegistry(fs, paths);
+    if (!read.ok)
+        return { ok: false, reason: read.reason };
+    const key = hashContextId(contextId);
+    if (read.registry.bindings[key] === folder)
+        return { ok: true, changed: false };
+    const bindings = { ...read.registry.bindings, [key]: folder };
+    await writeBindingRegistry(fs, paths, bindings);
+    return { ok: true, changed: true };
+}
+/**
+ * Drop every association pointing at `folder` (session closed). Other
+ * conversations keep theirs — a closed session never redirects to another line.
+ */
+export async function invalidateBindingsTo(fs, paths, folder) {
+    const read = await readBindingRegistry(fs, paths);
+    if (!read.ok)
+        return { ok: false, reason: read.reason };
+    const kept = {};
+    let removed = 0;
+    for (const [key, value] of Object.entries(read.registry.bindings)) {
+        if (value === folder)
+            removed += 1;
+        else
+            kept[key] = value;
+    }
+    if (removed > 0)
+        await writeBindingRegistry(fs, paths, kept);
+    return { ok: true, removed };
+}
+function emptyRegistry() {
+    return { version: BINDINGS_VERSION, bindings: {} };
+}
+async function writeBindingRegistry(fs, paths, bindings) {
+    // Keys sorted so the file is byte-stable across runs regardless of insertion
+    // order (diffable, golden-friendly).
+    const sorted = {};
+    for (const key of Object.keys(bindings).sort()) {
+        const value = bindings[key];
+        if (value !== undefined)
+            sorted[key] = value;
+    }
+    const payload = { version: BINDINGS_VERSION, bindings: sorted };
+    await fs.mkdirp(paths.cwdSessionsDir());
+    await fs.writeText(paths.cwdSessionBindingsFile(), `${JSON.stringify(payload, null, 2)}\n`);
+}
+//# sourceMappingURL=session-binding-service.js.map

package/dist/application/session-binding-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-binding-service.js","sourceRoot":"","sources":["../../src/application/session-binding-service.ts"],"names":[],"mappings":"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"}

package/dist/application/session-close-service.js

@@ -1,55 +1,76 @@
 import { join } from "node:path";
-import { runHistoryUpdate } from "./history-update-service.js";
+import { historyFields, upsertHistoryRow } from "./history-update-service.js";
+import { withCwdLock } from "./lock-service.js";
 import { canonicalArtifactPath } from "./session-artifacts.js";
-import { CLOSED_MARKER, resolveSession } from "./session-resolver.js";
-export async function runSessionClose(fs, env, paths, input) {
+import { invalidateBindingsTo } from "./session-binding-service.js";
+import { CLOSED_MARKER, resolveSessionTarget, } from "./session-resolver.js";
+export async function runSessionClose(fs, paths, input) {
+    // Closing is destructive to continuity: it always names its target. Falling
+    // back to "the sole active one" would let a conversation close a line it
+    // never selected.
     if (!input.code)
         return { error: "--code es obligatorio" };
-    const session = await resolveSession(fs, env, paths, input.code, true);
-    if (!session)
-        return { error: `Sesión no encontrada: ${input.code}` };
-    // Persist the durable artifacts in the session folder (they survive close).
-    // CHECKPOINT is a resume safety net (no-op when the loop already wrote one).
-    // BACKLOG is NOT fabricated here: the owning loop writes a real BACKLOG.md
-    // only when there is deferred/followup content, so close no longer creates
-    // an empty boilerplate file. `backlog_path` still reports the canonical path.
+    const resolution = await resolveSessionTarget(fs, paths, { code: input.code, allowClosed: true });
+    if (resolution.outcome !== "resolved")
+        return { sessionError: resolution };
+    const session = resolution.session;
+    // Durable artifacts survive close. CHECKPOINT is a resume safety net (no-op
+    // when the loop already wrote one). BACKLOG is NOT fabricated: the owning loop
+    // writes it only when there is deferred content; `backlog_path` still reports
+    // the canonical path.
     const checkpointPath = canonicalArtifactPath(session.path, "checkpoint");
-    const backlogPath = canonicalArtifactPath(session.path, "backlog");
     await ensureFile(fs, checkpointPath, "# CHECKPOINT\n");
-    // Mark the session closed via the folder-local sentinel file.
-    // Sessions are internal/light: closing does not touch the project block.
-    await fs.writeText(join(session.path, CLOSED_MARKER), "");
+    const refs = input.refs?.trim();
+    const closure = await closeUnderLock(fs, paths, session, {
+        code: session.code ?? input.code,
+        ...(refs !== undefined && refs.length > 0 ? { refs } : {}),
+    });
+    if ("error" in closure)
+        return closure;
     const sessionClose = {
-        code: session.code ?? input.code ?? "",
+        code: session.code ?? input.code,
         folder: session.folder,
         closed: true,
         checkpoint_path: checkpointPath,
-        backlog_path: backlogPath,
+        backlog_path: canonicalArtifactPath(session.path, "backlog"),
+        ...(refs !== undefined && refs.length > 0 ? { refs } : {}),
+        bindings_invalidated: closure.bindings_invalidated,
+        ...(closure.history ? { history: closure.history } : {}),
+        ...(closure.history_error !== undefined ? { history_error: closure.history_error } : {}),
     };
-    if (input.refs && input.refs.trim().length > 0) {
-        sessionClose.refs = input.refs.trim();
-    }
-    // Sessions are gitignored (machine-local live log); HISTORY.md is the durable,
-    // committable record — close upserts its row here so it actually gets written
-    // (doctrine-only wiring proved dead: nothing ever called `aw history-update`).
-    // Non-fatal: a busy lock or a write failure never blocks closing.
-    try {
-        const history = await runHistoryUpdate(fs, env, paths, {
-            code: sessionClose.code,
-            state: "closed",
-            ...(sessionClose.refs !== undefined ? { refs: sessionClose.refs } : {}),
-        });
-        if ("error" in history) {
-            sessionClose.history_error = history.error;
+    return { sessionClose };
+}
+/**
+ * The whole shared-state mutation of a close, under ONE lock acquisition:
+ * invalidate the associations pointing here, write the `.closed` marker, upsert
+ * the HISTORY row. HISTORY goes through the lock-free primitive on purpose —
+ * its public command takes the lock itself, and nesting would deadlock.
+ *
+ * The registry goes FIRST: if it cannot be read, the close aborts having
+ * mutated nothing, rather than leaving a closed session that conversations are
+ * still associated with.
+ */
+async function closeUnderLock(fs, paths, session, row) {
+    const result = await withCwdLock(fs, paths, async () => {
+        const invalidated = await invalidateBindingsTo(fs, paths, session.folder);
+        if (!invalidated.ok) {
+            return { ok: false, failure: { error: invalidated.reason, code: "SESSION_BINDING_INVALID" } };
         }
-        else {
-            sessionClose.history = { action: history.action, state: history.state };
+        await fs.writeText(join(session.path, CLOSED_MARKER), "");
+        const closure = { bindings_invalidated: invalidated.removed };
+        try {
+            const history = await upsertHistoryRow(fs, paths, historyFields({ ...row, state: "closed" }, session, row.code));
+            closure.history = { action: history.action, state: history.state };
         }
-    }
-    catch (err) {
-        sessionClose.history_error = err instanceof Error ? err.message : String(err);
-    }
-    return { sessionClose };
+        catch (err) {
+            // Non-fatal, as before: the caller re-runs `aw history-update` on this.
+            closure.history_error = err instanceof Error ? err.message : String(err);
+        }
+        return { ok: true, closure };
+    });
+    if ("error" in result)
+        return { error: result.error, code: "LOCK_BUSY" };
+    return result.ok ? result.closure : result.failure;
 }
 async function ensureFile(fs, path, defaultContent) {
     if (await fs.exists(path))

package/dist/application/session-close-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-close-service.js","sourceRoot":"","sources":["../../src/application/session-close-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session-close-service.js","sourceRoot":"","sources":["../../src/application/session-close-service.ts"],"names":[],"mappings":"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"}

package/dist/application/session-create-service.js

@@ -1,13 +1,15 @@
 import { join } from "node:path";
+import { withCwdLock } from "./lock-service.js";
 import { canonicalArtifactPath } from "./session-artifacts.js";
+import { bindContextToSession, readBindingRegistry } from "./session-binding-service.js";
 import { renderSessionMarkdown } from "./templates/session.js";
 const VALID_TYPES = ["research", "refine", "exec", "quick"];
-export async function runSessionCreate(fs, _env, paths, input) {
+export async function runSessionCreate(fs, paths, input) {
     const validated = validateInput(input);
     if ("error" in validated)
         return validated;
     const { type, name, objetivo } = validated;
-    const folderInfo = await prepareSessionFolder(fs, paths, name);
+    const folderInfo = await claimSessionFolder(fs, paths, name, input.contextId);
     if ("error" in folderInfo)
         return folderInfo;
     const sessionPath = folderInfo.sessionPath;
@@ -53,23 +55,47 @@ function validateInput(input) {
         return { error: "--objetivo es obligatorio" };
     return { type: type, name, objetivo };
 }
-async function prepareSessionFolder(fs, paths, name) {
-    const sessionsDir = paths.cwdSessionsDir();
-    await fs.mkdirp(sessionsDir);
-    // The CLI owns the session number: a single global, sequential counter across
-    // ALL sessions in `.workflow/sessions/` (any type), so numbering never resets
-    // per type nor collides. Callers pass only the descriptor via `--name`; the
-    // `NNN-` prefix is assigned here. A descriptor that already carries a leading
-    // `NNN-` is normalized away first so the prefix can't double up.
-    const descriptor = name.replace(/^\d{3}-/, "");
-    const number = await nextSessionNumber(fs, sessionsDir);
-    const folder = `${number}-${descriptor}`;
-    const sessionPath = join(sessionsDir, folder);
-    if (await fs.exists(sessionPath)) {
-        return { error: `Ya existe ${sessionPath}` };
-    }
-    await fs.mkdirp(sessionPath);
-    return { folder, number, sessionPath, sessionsDir };
+/**
+ * Claim number + folder + conversation association under ONE lock: two
+ * concurrent creations must not read the same counter and race for the same
+ * `NNN`, and the new line must belong to its conversation the moment it exists.
+ */
+async function claimSessionFolder(fs, paths, name, contextId) {
+    const id = contextId?.trim() ?? "";
+    const result = await withCwdLock(fs, paths, async () => {
+        // Fail before creating anything when the registry cannot be read: a session
+        // that exists but could not be associated is worse than one never created.
+        if (id.length > 0) {
+            const registry = await readBindingRegistry(fs, paths);
+            if (!registry.ok) {
+                return {
+                    ok: false,
+                    failure: { error: registry.reason, code: "SESSION_BINDING_INVALID" },
+                };
+            }
+        }
+        const sessionsDir = paths.cwdSessionsDir();
+        await fs.mkdirp(sessionsDir);
+        // The CLI owns the session number: a single global, sequential counter across
+        // ALL sessions in `.workflow/sessions/` (any type), so numbering never resets
+        // per type nor collides. Callers pass only the descriptor via `--name`; the
+        // `NNN-` prefix is assigned here. A descriptor that already carries a leading
+        // `NNN-` is normalized away first so the prefix can't double up.
+        const descriptor = name.replace(/^\d{3}-/, "");
+        const number = await nextSessionNumber(fs, sessionsDir);
+        const folder = `${number}-${descriptor}`;
+        const sessionPath = join(sessionsDir, folder);
+        if (await fs.exists(sessionPath)) {
+            return { ok: false, failure: { error: `Ya existe ${sessionPath}` } };
+        }
+        await fs.mkdirp(sessionPath);
+        if (id.length > 0)
+            await bindContextToSession(fs, paths, id, folder);
+        return { ok: true, info: { folder, number, sessionPath } };
+    });
+    if ("error" in result)
+        return { error: result.error, code: "LOCK_BUSY" };
+    return result.ok ? result.info : result.failure;
 }
 /**
  * Next global session number: scan `.workflow/sessions/` for any entry whose name

package/dist/application/session-create-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-create-service.js","sourceRoot":"","sources":["../../src/application/session-create-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session-create-service.js","sourceRoot":"","sources":["../../src/application/session-create-service.ts"],"names":[],"mappings":"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"}

package/dist/application/session-resolver.js

@@ -1,8 +1,10 @@
 import { join } from "node:path";
 import { localDateIso } from "./dates.js";
+import { withCwdLock } from "./lock-service.js";
 import { firstNonEmptyLine, parseMdSectionBilingual, parseMdValueBilingual } from "./markdown.js";
 import { relpath } from "./paths.js";
 import { findArtifact } from "./session-artifacts.js";
+import { bindContextToSession, lookupBinding } from "./session-binding-service.js";
 const SESSION_FOLDER_RE = /^session(\d{3})-(.+)$/;
 /** Folder-local sentinel file marking a session as closed. */
 export const CLOSED_MARKER = ".closed";
@@ -56,58 +58,192 @@ export async function listSessionFolders(fs, dir) {
         .map((e) => ({ name: e.name, path: e.path }))
         .sort((a, b) => a.name.localeCompare(b.name));
 }
-export async function resolveSession(fs, env, paths, sessionCode, anyState = false) {
-    // env preserved in signature for symmetry with sibling services; the
-    // sessions directory now resolves via paths so namespace flows through.
-    void env;
-    const dir = paths.cwdSessionsDir();
-    const folders = await listSessionFolders(fs, dir);
-    if (folders.length === 0)
+/**
+ * Request shape shared by every session-scoped READ: an optional explicit
+ * identity, the conversation's own association as the fallback, a closed target
+ * accepted (reading a finished line is legitimate), and the association
+ * established so later operations in the same conversation stay on this line.
+ *
+ * `exactOptionalPropertyTypes` is on, hence the spreads instead of assigning
+ * `undefined`.
+ */
+export function sessionReadRequest(input) {
+    return {
+        ...(input.code !== undefined ? { code: input.code } : {}),
+        ...(input.contextId !== undefined ? { contextId: input.contextId } : {}),
+        allowClosed: true,
+        bind: true,
+    };
+}
+/**
+ * Numeric identity of a session folder: `044` for `044-<slug>`, `007` for the
+ * legacy `session007-<slug>`, `null` when the folder carries no numeric prefix.
+ *
+ * Deliberately distinct from `parseSessionFolder().code`, which returns the
+ * WHOLE folder name for current-model folders — HISTORY rows and the commit
+ * advisor key off that shape, so it stays as it is.
+ */
+export function sessionNumericCode(folder) {
+    const m = folder.match(/^(?:session)?(\d+)-/);
+    return m?.[1] ?? null;
+}
+export async function resolveSessionTarget(fs, paths, request) {
+    const resolution = await walkPrecedence(fs, paths, request);
+    if (resolution.outcome !== "resolved" || request.bind !== true)
+        return resolution;
+    return (await establishBinding(fs, paths, request.contextId, resolution)) ?? resolution;
+}
+async function walkPrecedence(fs, paths, request) {
+    const folders = await listSessionFolders(fs, paths.cwdSessionsDir());
+    const scanned = await scanFolders(fs, folders);
+    const code = request.code?.trim() ?? "";
+    if (code.length > 0) {
+        return resolveExplicit(fs, scanned, code, request.allowClosed === true);
+    }
+    const contextId = request.contextId?.trim() ?? "";
+    if (contextId.length > 0) {
+        const viaBinding = await resolveFromBinding(fs, paths, scanned, contextId);
+        if (viaBinding !== null)
+            return viaBinding;
+    }
+    return resolveSoleActive(fs, scanned);
+}
+/**
+ * Persist the association a successful resolution implies. Both an explicit
+ * selection and the sole-active fallback establish it (`via: "binding"` already
+ * IS the association, and a conversation with no id has nothing to associate).
+ * Returns an error to replace the resolution when the registry cannot be
+ * written — fail-closed: a caller must never believe it got associated when it
+ * did not. `null` = nothing to report.
+ */
+async function establishBinding(fs, paths, contextId, resolution) {
+    const id = contextId?.trim() ?? "";
+    if (id.length === 0 || resolution.via === "binding")
         return null;
-    folders.sort((a, b) => b.name.localeCompare(a.name));
-    if (sessionCode !== undefined && sessionCode.length > 0) {
-        const lookupCode = normalizeCode(sessionCode);
-        for (const folder of folders) {
-            const { code } = parseSessionFolder(folder.name);
-            // Match the legacy numeric code, an exact new-model folder name, or a
-            // prefix up to a `-` word boundary. The boundary matters: a bare
-            // `startsWith(code)` lets "100" fuzzy-match "1000-…" (reachable once the
-            // global counter passes 999 and 4-digit prefixes coexist with 3-digit
-            // ones) or "01" match "012-…", silently resolving the wrong session.
-            // Anchor on the normalized `lookupCode` so abbreviated numeric codes
-            // (e.g. `--code 1`) resolve consistently too.
-            if (code === lookupCode ||
-                folder.name === lookupCode ||
-                folder.name.startsWith(`${lookupCode}-`)) {
-                return buildSessionEntry(fs, folder.path, folder.name);
-            }
-        }
+    // Never associate a conversation with a closed session: the binding path
+    // treats a closed target as stale, so writing one would poison the next read.
+    if (resolution.session.state === "closed")
         return null;
-    }
+    // Optimistic, and deliberately so. The common case is an association that
+    // already points here — a loop re-running `--code NNN` every turn. Reading is
+    // lock-free, so an ordinary session-scoped read neither contends for the
+    // workspace lock nor starts failing while another operation holds it.
+    const current = await lookupBinding(fs, paths, id);
+    if (current.status === "bound" && current.folder === resolution.session.folder)
+        return null;
+    if (current.status === "invalid")
+        return bindingFailure(resolution.session, current.reason);
+    const written = await withCwdLock(fs, paths, () => bindContextToSession(fs, paths, id, resolution.session.folder));
+    if ("error" in written)
+        return bindingFailure(resolution.session, written.error);
+    return written.ok ? null : bindingFailure(resolution.session, written.reason);
+}
+function bindingFailure(session, reason) {
+    return {
+        outcome: "error",
+        code: "SESSION_BINDING_INVALID",
+        message: `no se pudo asociar la conversación a '${session.folder}': ${reason}`,
+        candidates: [
+            { folder: session.folder, code: sessionNumericCode(session.folder), state: session.state },
+        ],
+        action: "inspeccioná o retirá `.workflow/sessions/.bindings.json` y reintentá",
+    };
+}
+async function scanFolders(fs, folders) {
+    const out = [];
     for (const folder of folders) {
-        const entry = await buildSessionEntry(fs, folder.path, folder.name);
-        if (entry.state === "active") {
-            return entry;
-        }
+        out.push({
+            name: folder.name,
+            path: folder.path,
+            code: sessionNumericCode(folder.name),
+            state: await stateFromClosedMarker(fs, folder.path),
+        });
+    }
+    return out;
+}
+async function resolveExplicit(fs, scanned, code, allowClosed) {
+    const matches = scanned.filter((s) => matchesIdentity(s.name, code));
+    const only = matches.length === 1 ? matches[0] : undefined;
+    if (only === undefined) {
+        return matches.length === 0
+            ? resolutionError("SESSION_NOT_FOUND", `no existe una sesión que coincida con '${code}'`, scanned, "revisá `aw sessions` y reintentá con un código o carpeta existente")
+            : resolutionError("SESSION_AMBIGUOUS", `'${code}' coincide con ${matches.length} sesiones`, matches, "reintentá con el nombre exacto de la carpeta");
     }
-    if (anyState) {
-        const first = folders[0];
-        if (first) {
-            return buildSessionEntry(fs, first.path, first.name);
-        }
+    if (only.state === "closed" && !allowClosed) {
+        return resolutionError("SESSION_CLOSED", `la sesión '${only.name}' está cerrada`, [only], "reabrila con `aw session-resume --code <NNN> --reopen` o elegí una sesión activa");
     }
-    return null;
+    return {
+        outcome: "resolved",
+        via: "explicit",
+        session: await buildSessionEntry(fs, only.path, only.name),
+    };
 }
-function normalizeCode(input) {
-    // Legacy numeric codes pad to 3 digits; legacy `sessionNNN-...` strips the prefix.
-    // New-model slugs are used verbatim (the folder name is the identity).
-    if (/^\d+$/.test(input)) {
-        return input.padStart(3, "0");
+/** `null` = this conversation has no association; keep walking the precedence. */
+async function resolveFromBinding(fs, paths, scanned, contextId) {
+    const lookup = await lookupBinding(fs, paths, contextId);
+    if (lookup.status === "unbound")
+        return null;
+    if (lookup.status === "invalid") {
+        return resolutionError("SESSION_BINDING_INVALID", lookup.reason, scanned, "inspeccioná o retirá `.workflow/sessions/.bindings.json`, o indicá la sesión con --code");
+    }
+    // A stale association fails closed. Redirecting it to another active session
+    // is exactly the session mixing this resolver exists to prevent.
+    const target = scanned.find((s) => s.name === lookup.folder);
+    if (target === undefined) {
+        return resolutionError("SESSION_BINDING_INVALID", `la conversación está asociada a '${lookup.folder}', que ya no existe`, scanned, "reasociá la conversación reanudando explícitamente con --code");
+    }
+    if (target.state === "closed") {
+        return resolutionError("SESSION_BINDING_INVALID", `la conversación está asociada a '${lookup.folder}', que está cerrada`, scanned, "reasociá la conversación con `aw session-resume --code <NNN> --reopen`");
+    }
+    return {
+        outcome: "resolved",
+        via: "binding",
+        session: await buildSessionEntry(fs, target.path, target.name),
+    };
+}
+async function resolveSoleActive(fs, scanned) {
+    const actives = scanned.filter((s) => s.state === "active");
+    const only = actives.length === 1 ? actives[0] : undefined;
+    if (only !== undefined) {
+        return {
+            outcome: "resolved",
+            via: "sole_active",
+            session: await buildSessionEntry(fs, only.path, only.name),
+        };
     }
-    if (/^session\d/.test(input)) {
-        return input.replace("session", "").split("-")[0] ?? "";
+    if (actives.length === 0) {
+        return resolutionError("SESSION_NOT_FOUND", "no hay sesiones activas en el workspace", scanned, "creá una con `aw session-create` o indicá una existente con --code");
     }
-    return input;
+    return resolutionError("SESSION_AMBIGUOUS", `hay ${actives.length} sesiones activas y la conversación no tiene una asociación`, actives, "indicá cuál con --code <NNN>");
+}
+/**
+ * Identity match, anchored on a `-` word boundary so `100` never matches
+ * `1000-…` nor `01` matches `012-…`. A numeric identity also reaches the legacy
+ * `sessionNNN-…` layout, so one code resolves a session in either format.
+ */
+function matchesIdentity(folder, input) {
+    if (folder === input)
+        return true;
+    const digits = numericIdentity(input);
+    if (digits !== null) {
+        return folder.startsWith(`${digits}-`) || folder.startsWith(`session${digits}-`);
+    }
+    return folder.startsWith(`${input}-`);
+}
+function numericIdentity(input) {
+    if (/^\d+$/.test(input))
+        return input.padStart(3, "0");
+    const legacy = input.match(/^session(\d+)/);
+    return legacy?.[1] ? legacy[1].padStart(3, "0") : null;
+}
+function resolutionError(code, message, candidates, action) {
+    return {
+        outcome: "error",
+        code,
+        message,
+        candidates: candidates.map((s) => ({ folder: s.name, code: s.code, state: s.state })),
+        action,
+    };
 }
 /**
  * Fallback when SESSION.md carries no `## Type` (no longer rendered): derive