@mafdet/cli 0.4.3 → 0.4.4

package/dist/commands/agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/commands/agent.ts"],"names":[],"mappings":"AAKA,OAAO,EAAe,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAOvE,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGnD,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAatB,eAAO,MAAM,gBAAgB,0XAK+C,CAAC;AAE7E,eAAO,MAAM,YAAY,mgBAOmB,CAAC;AAE7C,MAAM,WAAW,OAAQ,SAAQ,SAAS;IACxC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,qDAAqD;IACrD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,uBAAuB,EAAE,QAAQ,CAAC;CACrD;AAED,wBAAsB,YAAY,CAChC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,OAAO,GACV,OAAO,CAAC,QAAQ,CAAC,CA+GnB;AAgFD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,YAAY,EAAE,kBAAkB,EAAE,OAAO,0JAI3E"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/commands/agent.ts"],"names":[],"mappings":"AAKA,OAAO,EAAe,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAYvE,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGnD,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAatB,eAAO,MAAM,gBAAgB,0XAK+C,CAAC;AAE7E,eAAO,MAAM,YAAY,mgBAOmB,CAAC;AAE7C,MAAM,WAAW,OAAQ,SAAQ,SAAS;IACxC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,qDAAqD;IACrD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,uBAAuB,EAAE,QAAQ,CAAC;CACrD;AAED,wBAAsB,YAAY,CAChC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,OAAO,GACV,OAAO,CAAC,QAAQ,CAAC,CAsHnB;AAyJD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,YAAY,EAAE,kBAAkB,EAAE,OAAO,0JAI3E"}

package/dist/commands/agent.js

@@ -2,6 +2,11 @@ import { fetchAccessibleModels, fetchCatalog, intersectModels, } from "../api/mo
 import { approverFor } from "../agent/approvals.js";
 import { runAgent } from "../agent/loop.js";
 import { runSession } from "../agent/session.js";
+import { sessionsDir } from "../config/paths.js";
+import { keyDigest } from "../security/redact.js";
+import { decideRecording } from "../sessions/policy.js";
+import { SessionRecorder } from "../sessions/recorder.js";
+import { SessionWriter } from "../sessions/store.js";
 import { READ_ONLY_TOOLS } from "../agent/tools/read-only.js";
 import { COMMAND_TOOLS } from "../agent/tools/run-command.js";
 import { WRITE_TOOLS } from "../agent/tools/write.js";
@@ -74,8 +79,14 @@ export async function agentCommand(argv, io) {
                 io.stderr(`mafdet agent: no goal\n${USAGE}`);
                 return ExitCode.Usage;
             }
+            // F-007 · `decideRecording` already called this surface "interactive",
+            // so the policy claimed these runs were saved while nothing saved them.
+            const recorder = openRecorder(parsed, io, model, workspace.root, mode);
             const summary = await runSession({
                 client: runtime.dataPlane,
+                ...(recorder === undefined
+                    ? {}
+                    : { onEvent: (event) => recorder.observe(event) }),
                 model,
                 pricing: resolved,
                 catalog,
@@ -89,6 +100,7 @@ export async function agentCommand(argv, io) {
                 stderr: io.stderr,
                 signal: io.signal,
             });
+            recorder?.close();
             io.stderr("\n" +
                 renderRecord([
                     ["goals", `${summary.goals}`],
@@ -130,6 +142,45 @@ export async function agentCommand(argv, io) {
         return reportError(error, io);
     }
 }
+/**
+ * F-007 · A recorder for an interactive `mafdet agent`, or nothing.
+ *
+ * The same store, policy and failure behaviour as the TUI: `--no-history`
+ * writes nothing at all, and a store that cannot be opened costs the
+ * transcript rather than the session.
+ */
+function openRecorder(parsed, io, modelId, workspaceRoot, mode) {
+    const decision = decideRecording({
+        surface: "interactive",
+        noHistory: parsed.noHistory,
+        save: false,
+    });
+    if (!decision.record)
+        return undefined;
+    const env = io.env ?? process.env;
+    const root = sessionsDir(env);
+    try {
+        const writer = SessionWriter.create({
+            root,
+            title: parsed.title ??
+                workspaceRoot.split(/[\\/]/).filter(Boolean).at(-1) ??
+                "Conversation",
+            modelId,
+            workspace: workspaceRoot,
+            mode,
+        });
+        return new SessionRecorder({
+            writer,
+            root,
+            apiKeyRef: keyDigest(env.MAFDET_API_KEY ?? ""),
+            onProblem: (message) => io.stderr(`${message}\n`),
+        });
+    }
+    catch (error) {
+        io.stderr(`not recording this conversation: ${error instanceof Error ? error.message : String(error)}\n`);
+        return undefined;
+    }
+}
 function parseArgs(argv, io) {
     const positional = [];
     let model;
@@ -137,6 +188,8 @@ function parseArgs(argv, io) {
     let maxCostMicroUsd;
     let json = false;
     let allowWrite = false;
+    let noHistory = false;
+    let title;
     const allowedCommands = [];
     for (let i = 0; i < argv.length; i += 1) {
         const arg = argv[i];
@@ -157,6 +210,25 @@ function parseArgs(argv, io) {
         }
         else if (arg === "--read-only")
             allowWrite = false;
+        else if (arg === "--no-history")
+            noHistory = true;
+        else if (arg === "--title") {
+            const entry = next();
+            if (!entry) {
+                io.stderr("mafdet agent: --title needs a value\n");
+                return ExitCode.Usage;
+            }
+            title = entry;
+        }
+        else if (arg === "--resume") {
+            // F-007 · Deliberately not implemented here, and said rather than
+            // silently ignored. Resuming has to reconcile the session's model and
+            // workspace against the current key, which the TUI has a place to do
+            // and this surface does not - and a second, weaker resume path is
+            // exactly how the two drift apart. F-003 was that drift.
+            io.stderr("mafdet agent: --resume is not available here; run 'mafdet --resume <id>'\n");
+            return ExitCode.Usage;
+        }
         else if (arg === "--max-turns") {
             const raw = next();
             maxTurns = Number(raw);
@@ -198,6 +270,8 @@ function parseArgs(argv, io) {
         maxTurns,
         maxCostMicroUsd,
         json,
+        noHistory,
+        ...(title === undefined ? {} : { title }),
     };
 }
 /**
@@ -258,6 +332,8 @@ function finish(report, json, io) {
         case "max_turns":
         case "timeout":
         case "max_cost":
+        // F-008 · A ceiling too: the window ran out, and the report says which.
+        case "context_limit":
             // Stopped short on purpose; the report says so rather than pretending.
             return ExitCode.LimitReached;
         case "rate_limited":

package/dist/commands/chat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chat.d.ts","sourceRoot":"","sources":["../../src/commands/chat.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAkB,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAOxE,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAatB,MAAM,WAAW,MAAO,SAAQ,SAAS;IACvC,qDAAqD;IACrD,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAClC,gDAAgD;IAChD,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAcD,wBAAsB,WAAW,CAC/B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,QAAQ,CAAC,CA8BnB;AAoSD,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,YAAY,GAAG,SAAS,EAC/B,KAAK,EAAE,WAAW,GACjB,MAAM,GAAG,SAAS,CASpB"}
+{"version":3,"file":"chat.d.ts","sourceRoot":"","sources":["../../src/commands/chat.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAkB,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAWxE,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAatB,MAAM,WAAW,MAAO,SAAQ,SAAS;IACvC,qDAAqD;IACrD,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAClC,gDAAgD;IAChD,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAcD,wBAAsB,WAAW,CAC/B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,QAAQ,CAAC,CA8BnB;AA8SD,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,YAAY,GAAG,SAAS,EAC/B,KAAK,EAAE,WAAW,GACjB,MAAM,GAAG,SAAS,CASpB"}

package/dist/commands/chat.js

@@ -2,6 +2,7 @@ import { readFileSync } from "node:fs";
 import { fetchCatalog } from "../api/models.js";
 import { readChatStream } from "../api/sse-parser.js";
 import { ApiError } from "../api/errors.js";
+import { safeForTerminal, terminalSafeWriter, } from "../output/terminal-safe.js";
 import { sessionsDir } from "../config/paths.js";
 import { keyDigest } from "../security/redact.js";
 import { upsertIndexEntry } from "../sessions/index-file.js";
@@ -196,7 +197,11 @@ function saveChat(args, io, answer, usage, requestId, model) {
                 model_id: args.model,
                 prompt_tokens: usage.prompt_tokens,
                 completion_tokens: usage.completion_tokens,
-                estimated_charge_micro_usd: (micros ?? 0n).toString(),
+                // F-012 · Omitted rather than zeroed when the catalogue could not
+                // price it: "we do not know" must not be recorded as "it was free".
+                ...(micros === undefined
+                    ? {}
+                    : { estimated_charge_micro_usd: micros.toString() }),
                 settlement_status: "pending",
                 api_key_ref: keyDigest(readKey(io)),
             });
@@ -217,6 +222,10 @@ function chatTitle(prompt) {
     const trimmed = line.trim();
     return trimmed.length > 60 ? `${trimmed.slice(0, 57)}...` : trimmed;
 }
+/** Whether a terminal is on the other end of stdout. Injectable for tests. */
+function isTty(io) {
+    return io.isTty ?? process.stdout.isTTY === true;
+}
 function readKey(io) {
     return (io.env ?? process.env).MAFDET_API_KEY ?? "";
 }
@@ -238,12 +247,20 @@ async function priceModel(runtime, modelId, needed) {
     }
 }
 async function streamChat(runtime, body, args, io) {
-    const { response, requestId } = await runtime.dataPlane.postStream("/chat/completions", body, {
+    const { response, requestId, abort, limits } = await runtime.dataPlane.postStream("/chat/completions", body, {
         signal: io.signal,
     });
     // Text goes to stdout as it arrives; everything else is stderr, so
     // `mafdet chat ... > answer.txt` captures only the answer.
-    const result = await readChatStream(response, { onText: io.stdout }, io.signal);
+    // F-009 · The limits travel with the stream: without them a gateway that
+    // sent headers and then went quiet would hang here indefinitely.
+    // F-010 · Sanitised only when a terminal is reading: `mafdet chat >
+    // answer.txt` and `| jq` must get the bytes the model sent.
+    const write = terminalSafeWriter(io.stdout, isTty(io));
+    const result = await readChatStream(response, { onText: write }, io.signal, {
+        ...limits,
+        abort,
+    });
     io.stdout("\n");
     const model = await priceModel(runtime, args.model, !args.quiet || args.save);
     if (io.signal?.aborted) {
@@ -260,7 +277,7 @@ async function streamChat(runtime, body, args, io) {
 async function completeChat(runtime, body, args, io) {
     const { data, requestId } = await runtime.dataPlane.postJson("/chat/completions", body, { signal: io.signal });
     const answer = data.choices?.[0]?.message?.content ?? "";
-    io.stdout(`${answer}\n`);
+    io.stdout(`${safeForTerminal(answer, isTty(io))}\n`);
     const model = await priceModel(runtime, args.model, !args.quiet || args.save);
     summarise(args, data.usage, io, model);
     saveChat(args, io, answer, data.usage, requestId, model);

package/dist/commands/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAOnD,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,SAAS,GACZ,QAAQ,CAwEV"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAOnD,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,SAAS,GACZ,QAAQ,CAsEV"}

package/dist/commands/config.js

@@ -44,7 +44,6 @@ export function configCommand(argv, io) {
         model_source: config.modelSource,
         base_url: config.baseUrl,
         backend_url: config.backendUrl,
-        approval_mode: config.approvalMode,
         api_key: config.apiKey ? keyFingerprint(config.apiKey) : null,
         user_config: config.sources.userConfigFound
             ? config.sources.userConfigPath
@@ -61,7 +60,6 @@ export function configCommand(argv, io) {
         ["model", view.model ? `${view.model} (${view.model_source})` : "<unset>"],
         ["base url", view.base_url],
         ["backend url", view.backend_url],
-        ["approval mode", view.approval_mode],
         ["api key", view.api_key ?? "<unset> (set MAFDET_API_KEY)"],
         ["user config", view.user_config ?? "<none>"],
         ["project config", view.project_config ?? "<none>"],

package/dist/commands/runtime.d.ts

@@ -10,6 +10,12 @@ export interface CommandIo {
     /** Injected by tests; production uses global fetch. */
     fetchImpl?: typeof fetch;
     version?: string;
+    /**
+     * F-010 · Whether stdout is a terminal. Untrusted text is stripped of
+     * control sequences only then: a pipe or a file must receive exact bytes.
+     * Defaults to `process.stdout.isTTY`; tests set it explicitly.
+     */
+    isTty?: boolean;
 }
 export interface Runtime {
     config: LoadedConfig;

package/dist/commands/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/commands/runtime.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,uDAAuD;IACvD,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,YAAY,CAAC;IACrB,sCAAsC;IACtC,SAAS,EAAE,UAAU,CAAC;IACtB,yCAAyC;IACzC,YAAY,EAAE,UAAU,CAAC;CAC1B;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAGjD;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO,CAgBnD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CASxD;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,GAAG,QAAQ,CAkBnE"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/commands/runtime.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,uDAAuD;IACvD,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,YAAY,CAAC;IACrB,sCAAsC;IACtC,SAAS,EAAE,UAAU,CAAC;IACtB,yCAAyC;IACzC,YAAY,EAAE,UAAU,CAAC;CAC1B;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAGjD;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO,CAgBnD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CASxD;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,GAAG,QAAQ,CAkBnE"}

package/dist/commands/sessions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../src/commands/sessions.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAuBnD,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAgBtB,wBAAsB,eAAe,CACnC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,QAAQ,CAAC,CAenB;AAqID,eAAO,MAAM,eAAe,GAAI,IAAI,MAAM,KAAG,MAUX,CAAC"}
+{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../src/commands/sessions.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AA4BnD,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAgBtB,wBAAsB,eAAe,CACnC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,QAAQ,CAAC,CAUnB;AA8PD,eAAO,MAAM,eAAe,GAAI,IAAI,MAAM,KAAG,MAUX,CAAC"}

package/dist/commands/sessions.js

@@ -11,14 +11,15 @@ import { sessionsDir } from "../config/paths.js";
 import { formatUsd } from "../output/money.js";
 import { ExitCode } from "../output/exit-codes.js";
 import { parseFormatFlags, renderJson, renderRecord, renderTable, } from "../output/format.js";
+import { safeForTerminal } from "../output/terminal-safe.js";
 import { keyDigest } from "../security/redact.js";
 import { loadIndex, removeIndexEntry } from "../sessions/index-file.js";
 import { acquireSessionLock, SessionLockedError } from "../sessions/lock.js";
 import { daysToCover, matchSettlements, planReconciliation, } from "../sessions/reconcile.js";
+import { InvalidSessionIdError, resolveSessionDirectory, } from "../sessions/session-id.js";
 import { deleteSession, readSession, SessionWriter, } from "../sessions/store.js";
 import { settledCaveat, summariseUsage } from "../sessions/usage.js";
 import { buildRuntime, reportError, requireApiKey, } from "./runtime.js";
-import { join } from "node:path";
 const USAGE = `Usage:
   mafdet sessions list [--json|--plain]
   mafdet sessions show <session-id> [--json]
@@ -32,6 +33,18 @@ calls a model and is never charged.
 cost. It sends request IDs and nothing else - no messages, no titles.
 `;
 export async function sessionsCommand(argv, io) {
+    // F-013 · Nothing here may reach the top level as a raw Error. `--json
+    // --plain` used to print an ESM stack trace and exit 1 instead of a usage
+    // message, and every other command surface already funnels through
+    // reportError.
+    try {
+        return await run(argv, io);
+    }
+    catch (error) {
+        return reportError(error, io);
+    }
+}
+async function run(argv, io) {
     const [sub, ...rest] = argv;
     const root = sessionsDir(io.env ?? process.env);
     if (sub === undefined || sub === "help" || sub === "--help") {
@@ -67,9 +80,12 @@ function list(argv, io, root) {
         return ExitCode.Ok;
     }
     io.stdout(renderTable(sessions, [
-        { header: "SESSION", value: (s) => s.session_id },
-        { header: "TITLE", value: (s) => s.title },
-        { header: "MODEL", value: (s) => s.model_id },
+        // F-010 · Every one of these came off disk. A transcript is a file, and
+        // a title carrying an OSC sequence would retitle the window of anyone
+        // who ran `sessions list`.
+        { header: "SESSION", value: (s) => safe(s.session_id, io) },
+        { header: "TITLE", value: (s) => safe(s.title, io) },
+        { header: "MODEL", value: (s) => safe(s.model_id, io) },
         { header: "REQUESTS", value: (s) => `${s.model_requests}` },
         {
             header: "EST. COST",
@@ -80,13 +96,17 @@ function list(argv, io, root) {
     return ExitCode.Ok;
 }
 function show(argv, io, root) {
-    const { format } = parseFormatFlags(argv);
-    const id = argv.find((arg) => !arg.startsWith("-"));
+    const { format, rest } = parseFormatFlags(argv);
+    const id = rest[0];
     if (id === undefined) {
         io.stderr(`mafdet sessions show: no session id\n${USAGE}`);
         return ExitCode.Usage;
     }
-    const directory = join(root, id);
+    if (!checkExtra("show", rest, io))
+        return ExitCode.Usage;
+    const directory = locate(root, id, io);
+    if (directory === undefined)
+        return ExitCode.Usage;
     if (!existsSync(directory)) {
         io.stderr(`mafdet sessions: no session '${id}' on this computer\n`);
         return ExitCode.General;
@@ -104,16 +124,17 @@ function show(argv, io, root) {
             metadata: session.metadata,
             events: session.events,
             truncated_tail: session.truncatedTail,
+            corrupt_lines: session.corruptLines,
         }));
         return ExitCode.Ok;
     }
     const m = session.metadata;
     io.stdout(renderRecord([
-        ["session", m.session_id],
-        ["title", m.title],
-        ["model", m.model_id],
-        ["workspace", m.workspace],
-        ["mode", m.mode],
+        ["session", safe(m.session_id, io)],
+        ["title", safe(m.title, io)],
+        ["model", safe(m.model_id, io)],
+        ["workspace", safe(m.workspace, io)],
+        ["mode", safe(m.mode, io)],
         ["created", m.created_at],
         ["updated", m.updated_at],
         ["messages", `${m.message_count}`],
@@ -125,16 +146,29 @@ function show(argv, io, root) {
         // Worth saying plainly: the user should know a crash cost them the tail.
         io.stderr("\nnote: the last event was incomplete, most likely an interrupted run.\n");
     }
+    if (session.corruptLines.length > 0) {
+        // F-016 · A hole in the middle is not an interrupted run - it is
+        // corruption or interleaved writes, and part of the conversation is
+        // simply gone. Presenting the rest as complete would be a lie.
+        io.stderr(`\nwarning: ${session.corruptLines.length} unreadable line(s) in this ` +
+            `transcript (line ${session.corruptLines.join(", ")}); ` +
+            `some of the conversation is missing.\n`);
+    }
     return ExitCode.Ok;
 }
 function remove(argv, io, root) {
-    const id = argv.find((arg) => !arg.startsWith("-"));
+    const { rest } = parseFormatFlags(argv);
+    const id = rest[0];
     const confirmed = argv.includes("--yes");
     if (id === undefined) {
         io.stderr(`mafdet sessions delete: no session id\n${USAGE}`);
         return ExitCode.Usage;
     }
-    const directory = join(root, id);
+    if (!checkExtra("delete", rest, io, ["--yes"]))
+        return ExitCode.Usage;
+    const directory = locate(root, id, io);
+    if (directory === undefined)
+        return ExitCode.Usage;
     if (!existsSync(directory)) {
         io.stderr(`mafdet sessions: no session '${id}' on this computer\n`);
         return ExitCode.General;
@@ -146,11 +180,84 @@ function remove(argv, io, root) {
         io.stderr(DELETION_NOTICE(id));
         return ExitCode.Usage;
     }
-    deleteSession(directory);
+    // F-002 · Under the lock: a session open in another window is still writing
+    // to this directory, and deleting underneath it leaves the live process to
+    // recreate half a session.
+    let lock;
+    try {
+        lock = acquireSessionLock(directory);
+    }
+    catch (error) {
+        // Not only SessionLockedError: an unwritable directory throws EACCES here,
+        // and letting that escape would print a Node stack trace at the user.
+        io.stderr(`mafdet sessions: cannot delete ${id}: ${error instanceof Error ? error.message : String(error)}\n`);
+        return ExitCode.General;
+    }
+    let result;
+    try {
+        result = deleteSession(directory);
+    }
+    finally {
+        // The lock file lives inside the directory, so a successful delete already
+        // took it with it; releasing is for the failure path.
+        try {
+            lock.release();
+        }
+        catch {
+            // Gone with the directory.
+        }
+    }
+    if (!result.removed) {
+        // F-002 · Never print "deleted" for something still on disk.
+        io.stderr(`mafdet sessions: ${id} was not fully deleted\n`);
+        for (const failure of result.failures) {
+            io.stderr(`  ${failure.path}: ${failure.reason}\n`);
+        }
+        // The index is rebuilt from the directories, so leaving the entry keeps
+        // the listing honest about what is still there.
+        return ExitCode.General;
+    }
     removeIndexEntry(root, id);
     io.stdout(`deleted ${id}\n`);
     return ExitCode.Ok;
 }
+/**
+ * F-001 · Turn an id into a directory, or say why not.
+ *
+ * The single boundary: `show`, `usage` and `delete` all come through here, so
+ * there is no subcommand left that can build the path its own way. Returns
+ * undefined after reporting, because every caller's response is the same.
+ */
+/**
+ * F-014 · Refuse what we were not asked to do.
+ *
+ * A mistyped flag or a stray second argument used to be dropped silently, so
+ * `sessions delete a b --yes` deleted `a` and said nothing about `b`, and
+ * `--dry-run` looked like it worked. Anything not recognised is an error.
+ */
+/** F-010 · Terminal-safe when a terminal is reading, exact bytes otherwise. */
+function safe(text, io) {
+    return safeForTerminal(text, io.isTty ?? process.stdout.isTTY === true);
+}
+function checkExtra(name, rest, io, known = []) {
+    const leftover = rest.slice(1).filter((arg) => !known.includes(arg));
+    if (leftover.length === 0)
+        return true;
+    io.stderr(`mafdet sessions ${name}: unexpected argument '${leftover[0]}'\n${USAGE}`);
+    return false;
+}
+function locate(root, id, io) {
+    try {
+        return resolveSessionDirectory(root, id);
+    }
+    catch (error) {
+        if (error instanceof InvalidSessionIdError) {
+            io.stderr(`mafdet sessions: ${error.message}\n`);
+            return undefined;
+        }
+        throw error;
+    }
+}
 export const DELETION_NOTICE = (id) => `Deleting ${id} removes local messages and its per-session usage mapping\n` +
     `from this computer.\n\n` +
     `It does not remove API usage, billing records, or charges.\n\n` +
@@ -170,13 +277,17 @@ export const DELETION_NOTICE = (id) => `Deleting ${id} removes local messages an
  * would be a smaller number than the truth.
  */
 async function usage(argv, io, root) {
-    const { format } = parseFormatFlags(argv);
-    const id = argv.find((arg) => !arg.startsWith("-"));
+    const { format, rest } = parseFormatFlags(argv);
+    const id = rest[0];
     if (id === undefined) {
         io.stderr(`mafdet sessions usage: no session id\n${USAGE}`);
         return ExitCode.Usage;
     }
-    const directory = join(root, id);
+    if (!checkExtra("usage", rest, io, ["--refresh"]))
+        return ExitCode.Usage;
+    const directory = locate(root, id, io);
+    if (directory === undefined)
+        return ExitCode.Usage;
     if (!existsSync(directory)) {
         io.stderr(`mafdet sessions: no session '${id}' on this computer\n`);
         return ExitCode.General;

package/dist/config/config.d.ts

@@ -6,20 +6,9 @@ export declare class ConfigError extends Error {
 }
 declare const projectConfigSchema: z.ZodObject<{
     model: z.ZodOptional<z.ZodString>;
-    approvalMode: z.ZodOptional<z.ZodEnum<{
-        "read-only": "read-only";
-        suggest: "suggest";
-        "auto-edit": "auto-edit";
-    }>>;
-    testCommands: z.ZodOptional<z.ZodArray<z.ZodString>>;
 }, z.core.$strict>;
 declare const userConfigSchema: z.ZodObject<{
     model: z.ZodOptional<z.ZodString>;
-    approvalMode: z.ZodOptional<z.ZodEnum<{
-        "read-only": "read-only";
-        suggest: "suggest";
-        "auto-edit": "auto-edit";
-    }>>;
     baseUrl: z.ZodOptional<z.ZodString>;
     backendUrl: z.ZodOptional<z.ZodString>;
 }, z.core.$strict>;
@@ -48,7 +37,6 @@ export interface ResolvedConfig {
     modelSource: "flag" | "env" | "project" | "user" | "none";
     baseUrl: string;
     backendUrl: string;
-    approvalMode: "read-only" | "suggest" | "auto-edit";
     apiKey?: string;
 }
 /** Plan §5.1: flag > env > project > user > default. */

package/dist/config/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,gBAAgB,6BAA6B,CAAC;AAC3D,eAAO,MAAM,mBAAmB,8BAA8B,CAAC;AAE/D,qBAAa,WAAY,SAAQ,KAAK;gBACxB,OAAO,EAAE,MAAM;CAK5B;AAYD,QAAA,MAAM,mBAAmB;;;;;;;;kBAMd,CAAC;AAEZ,QAAA,MAAM,gBAAgB;;;;;;;;;kBAOX,CAAC;AAEZ,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAChE,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,GAAG,CAczE;AAOD,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,CAWxE;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,GACb,aAAa,CAcf;AAED,MAAM,WAAW,YAAY;IAC3B,4CAA4C;IAC5C,KAAK,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,IAAI,CAAC,EAAE,UAAU,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iEAAiE;IACjE,WAAW,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS,GAAG,MAAM,GAAG,MAAM,CAAC;IAC1D,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,WAAW,GAAG,SAAS,GAAG,WAAW,CAAC;IACpD,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wDAAwD;AACxD,wBAAgB,aAAa,CAAC,KAAK,GAAE,YAAiB,GAAG,cAAc,CAiCtE"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,gBAAgB,6BAA6B,CAAC;AAC3D,eAAO,MAAM,mBAAmB,8BAA8B,CAAC;AAE/D,qBAAa,WAAY,SAAQ,KAAK;gBACxB,OAAO,EAAE,MAAM;CAK5B;AAoCD,QAAA,MAAM,mBAAmB;;kBAId,CAAC;AAEZ,QAAA,MAAM,gBAAgB;;;;kBAMX,CAAC;AAUZ,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAChE,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,GAAG,CAczE;AAOD,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,CAWxE;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,GACb,aAAa,CAef;AAED,MAAM,WAAW,YAAY;IAC3B,4CAA4C;IAC5C,KAAK,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,IAAI,CAAC,EAAE,UAAU,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iEAAiE;IACjE,WAAW,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS,GAAG,MAAM,GAAG,MAAM,CAAC;IAC1D,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wDAAwD;AACxD,wBAAgB,aAAa,CAAC,KAAK,GAAE,YAAiB,GAAG,cAAc,CA8BtE"}

package/dist/config/config.js

@@ -16,22 +16,48 @@ export class ConfigError extends Error {
  * silently dropping them would hide an attempt to redirect traffic.
  */
 const FORBIDDEN_IN_PROJECT = ["apiKey", "baseUrl", "backendUrl"];
-const approvalMode = z.enum(["read-only", "suggest", "auto-edit"]);
+/**
+ * F-006 · Accepted, displayed, and never read by anything.
+ *
+ * `approvalMode` and `testCommands` were in the schema, in `config list` and
+ * in the README, and no code consulted either - so a user could set
+ * `approvalMode: "auto-edit"` and believe approval had been turned off.
+ *
+ * They are removed rather than wired up, and the reason is not effort. Both
+ * are permission-granting settings, and in a project file that means a cloned
+ * repository raising its own permission level: `.mafdet.json` asking for
+ * `auto-edit`, or listing its own `testCommands` to run. §8.3 already refuses
+ * a global approval flag, and CLI-003 already treats a repository as
+ * untrusted input - honouring these would undo both.
+ *
+ * Rejected with an explanation rather than ignored, so anyone who set one
+ * finds out it never did what they thought.
+ */
+const REMOVED_KEYS = {
+    approvalMode: "it was never implemented, and a config file may not raise the approval " +
+        "level - use --allow-write for this run",
+    testCommands: "it was never implemented, and a config file may not grant command " +
+        "execution - use --allow-command for this run",
+};
 const projectConfigSchema = z
     .object({
     model: z.string().min(1).optional(),
-    approvalMode: approvalMode.optional(),
-    testCommands: z.array(z.string().min(1)).optional(),
 })
     .strict();
 const userConfigSchema = z
     .object({
     model: z.string().min(1).optional(),
-    approvalMode: approvalMode.optional(),
     baseUrl: z.string().url().optional(),
     backendUrl: z.string().url().optional(),
 })
     .strict();
+function rejectRemoved(raw, source) {
+    for (const [key, why] of Object.entries(REMOVED_KEYS)) {
+        if (hasKey(raw, key)) {
+            throw new ConfigError(`${source} sets '${key}': ${why}.`);
+        }
+    }
+}
 /**
  * Remote endpoints must be HTTPS. Plain HTTP is allowed only against the local
  * machine, where there is no network to intercept — that exception exists so a
@@ -72,6 +98,7 @@ export function parseProjectConfig(raw, source) {
                 `Credentials and endpoints come from the environment or your user config only.`);
         }
     }
+    rejectRemoved(raw, source);
     const parsed = projectConfigSchema.safeParse(raw);
     if (!parsed.success) {
         throw new ConfigError(`${source} is invalid: ${issueText(parsed.error)}`);
@@ -99,8 +126,6 @@ export function resolveConfig(input = {}) {
         modelSource,
         baseUrl,
         backendUrl,
-        // read-only is the safe default; a caller raises it explicitly.
-        approvalMode: input.project?.approvalMode ?? input.user?.approvalMode ?? "read-only",
         // The key is environment-only, by design (plan §5.4): a flag would put it
         // in shell history and the process list, a file would outlive its use.
         apiKey: trimmed(env.MAFDET_API_KEY),

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAeA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAmDlD,wBAAsB,GAAG,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAyGpE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAeA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAmElD,wBAAsB,GAAG,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAyGpE"}

package/dist/index.js

@@ -27,8 +27,10 @@ const HELP = `mafdet - Mafdet AI command line
 Usage:
   mafdet <command> [options]
 
+Run with no arguments in a terminal to open an interactive session.
+
 Commands:
-  agent             Inspect the workspace with a model (read-only)
+  agent             Work in this directory with a model
   chat              Send a prompt to a model
   embed             Turn text into a vector
   speech            Turn text into an audio file
@@ -39,6 +41,7 @@ Commands:
   account subscription  Current plan and Playground allowance
   sessions list     Conversations saved on this computer
   sessions show     One saved conversation in detail
+  sessions usage    What one conversation used, and what it was charged
   sessions delete   Remove a saved conversation from this computer
   config list       Show the resolved settings and where each came from
   doctor            Check key, endpoints, model, balance and workspace
@@ -49,6 +52,19 @@ Options:
   -h, --help        Show this help
   -v, --version     Print the version
 
+Interactive session (bare 'mafdet'):
+  --allow-write     Offer file changes, each shown as a diff and approved
+  --allow-command <prefix>  Allow one command prefix, approved per run
+  --read-only       Cancel an earlier --allow-write
+  --resume <id>     Continue a saved conversation
+  --title <text>    Name this conversation in the listing
+  --no-history      Do not record this run at all
+  --no-tui          Do not open the interactive session
+
+The agent is read-only unless told otherwise, every file change is shown as a
+diff and approved one at a time, and there is no flag that approves
+everything in advance.
+
 Docs: https://docs.mafdet.ai
 `;
 async function readStdin() {

package/dist/output/format.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../src/output/format.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,CAAC;AAEtD,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,YAAY,CAAC;IACrB,+DAA+D;IAC/D,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,2EAA2E;AAC3E,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,WAAW,CAiBrE;AAED,sDAAsD;AACtD,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAEjD;AAED,MAAM,WAAW,MAAM,CAAC,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,MAAM,CAAC;IAC1B,+DAA+D;IAC/D,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B;AAED,wBAAgB,WAAW,CAAC,CAAC,EAC3B,IAAI,EAAE,SAAS,CAAC,EAAE,EAClB,OAAO,EAAE,SAAS,MAAM,CAAC,CAAC,CAAC,EAAE,GAC5B,MAAM,CAoBR;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAC3B,IAAI,EAAE,SAAS,CAAC,EAAE,EAClB,OAAO,EAAE,SAAS,MAAM,CAAC,CAAC,CAAC,EAAE,GAC5B,MAAM,CAOR;AAED,wBAAgB,YAAY,CAC1B,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,GAC9C,MAAM,CAOR"}
+{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../src/output/format.ts"],"names":[],"mappings":"AAGA;;;GAGG;AAEH,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,CAAC;AAEtD,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,YAAY,CAAC;IACrB,+DAA+D;IAC/D,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,2EAA2E;AAC3E,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,WAAW,CAwBrE;AAED,sDAAsD;AACtD,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAEjD;AAED,MAAM,WAAW,MAAM,CAAC,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,MAAM,CAAC;IAC1B,+DAA+D;IAC/D,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B;AAED,wBAAgB,WAAW,CAAC,CAAC,EAC3B,IAAI,EAAE,SAAS,CAAC,EAAE,EAClB,OAAO,EAAE,SAAS,MAAM,CAAC,CAAC,CAAC,EAAE,GAC5B,MAAM,CAoBR;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAC3B,IAAI,EAAE,SAAS,CAAC,EAAE,EAClB,OAAO,EAAE,SAAS,MAAM,CAAC,CAAC,CAAC,EAAE,GAC5B,MAAM,CAOR;AAED,wBAAgB,YAAY,CAC1B,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,GAC9C,MAAM,CAOR"}