teamshare-bridge 0.21.10 → 0.21.11

package/dist/cli/commands/planner.js

@@ -35,51 +35,138 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cmdPlanner = cmdPlanner;
 /**
- * `planner` command: decompose a task into subtasks using the agent's
- * harness. The agent receives a planning brief, uses the `submit_plan`
- * MCP tool to return structured subtasks, and the result is written to
- * a temp file for the bridge to read and emit back to the backend.
+ * `planner` command: run a REAL planning session with the planner agent's
+ * harness (plan-mode parity). Two modes:
  *
- * The `submit_plan` MCP tool validates the plan (cycle detection, index
- * checks) but does NOT persist — the backend's `createChildren()` handles
- * all persistence after receiving the validated plan.
+ *  - `task`     — plan a SINGLE task: read the full task, research the project,
+ *                 rewrite the description + acceptance criteria, add checklist
+ *                 items, write `plan.md`, and (optionally) propose sub-tasks.
+ *                 NEVER creates replacement tasks.
+ *  - `overview` — plan the WHOLE dispatched batch: read every queued task,
+ *                 produce the shared plan on the plan task, the execution
+ *                 ORDER and the dependency edges. NEVER invents tasks.
  *
- * Falls back to headless LLM (complete()) when no harness is available.
+ * The agent returns its plan via the `submit_plan` MCP tool, which writes a
+ * temp file for the bridge to read and emit back to the backend. The backend
+ * applies it (ordering, nested sub-tasks, plan note) — this CLI only plans.
  */
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const node_os_1 = require("node:os");
 const api_1 = require("../../lib/api");
-const llm_1 = require("../../lib/llm/llm");
+const brief_1 = require("../../lib/brief");
 const lock_1 = require("../../lib/lock");
 const daemon_reporter_1 = require("../../lib/chat/daemon-reporter");
 const session_stream_1 = require("../../lib/chat/session-stream");
-const brief_1 = require("../../lib/brief");
 const utils_1 = require("../utils");
 const harness_1 = require("./harness");
 const shared_1 = require("./shared");
 const presence_1 = require("../../lib/workspace/presence");
-const PLANNER_PROMPT_TEMPLATE = `You are a software build planner. Break the task below into 2-5 concrete,
-independently verifiable subtasks, in dependency order.
-
-For each subtask, include a "verification" array with 2-4 concrete, checkable criteria
-(e.g. "build succeeds with no errors", "all tests pass", "endpoint returns 200", "docs updated").
-These become checklist items the agent must verify.
-
-Use the submit_plan MCP tool to submit your decomposition. Return ONLY the tool call,
-no prose explanation.
-
-TASK: {description}`;
+function sanitizeTitle(raw, fallback) {
+    const firstLine = (raw ?? "")
+        .split(/\r?\n/)
+        .map((l) => l.trim())
+        .find((l) => l.length > 0);
+    const cleaned = (firstLine ?? "")
+        .replace(/^[#>*\-\s]+/, "")
+        .replace(/[*_`#>]/g, "")
+        .replace(/\s+/g, " ")
+        .trim();
+    const title = cleaned ||
+        (raw ?? "")
+            .replace(/[*_`#>]/g, "")
+            .replace(/\s+/g, " ")
+            .trim();
+    if (!title)
+        return fallback;
+    return title.length > 120 ? `${title.slice(0, 117)}…` : title;
+}
+/** Shared planning rules: plan only, never execute, never invent tasks. */
+const PLANNING_RULES = `You are a planning agent working in PLAN MODE. You must NOT execute or implement anything - no code edits, no build commands, no file writes outside the plan note.
+
+## Rules
+- Plan ONLY. There is an execution queue that runs after you; you are the overview.
+- NEVER invent replacement tasks or restate a task that already exists. If a task already covers a step, reference it by name.
+- Use the TeamShare MCP tools to read (get_task, read_document, list_documents, list_checklist_items) and write (update_task, create_checklist_item, create_document, submit_plan).
+- ALWAYS finish by calling the **submit_plan** MCP tool with \`planTaskId\` set to the EXACT task id given below. Without that call your plan is lost.`;
+function buildTaskPrompt(planTaskId, task, projectName, brief) {
+    return (`${PLANNING_RULES}\n\n` +
+        `## Plan task (this is the task id you MUST pass to submit_plan)\n` +
+        `- **planTaskId:** ${planTaskId}\n` +
+        `- **Project:** ${projectName}\n` +
+        `- **Title:** ${task.title}\n` +
+        `- **Status:** ${task.status} · **Priority:** ${task.priority}\n` +
+        (task.tags?.length ? `- **Tags:** ${task.tags.join(", ")}\n` : "") +
+        `\n## Current description\n${task.description?.trim() || "(none)"}\n` +
+        `\n## Current acceptance criteria\n${task.acceptanceCriteria?.trim() || "(none)"}\n` +
+        `\n## What to do (plan only)\n` +
+        `1. Read the task and its context: use get_task with include comments/subtasks/checklist, and read linked documents with read_document.\n` +
+        `2. Research: consult the project context, \`docs/**\` notes and the relevant source files so the plan is grounded in the real codebase.\n` +
+        `3. Rewrite the description into a clear specification: goal, context, scope, out-of-scope, technical approach, risks.\n` +
+        `4. Write concrete, testable acceptance criteria and persist them with update_task (description, acceptanceCriteria).\n` +
+        `5. Add a verification checklist: call create_checklist_item once per acceptance criterion (task-scoped, no subtaskId).\n` +
+        `6. Write the plan note: create_document with a note named \`plan.md\` under \`agents/<you>/tasks/${planTaskId}\` explaining the approach, key files and risks.\n` +
+        `7. Finish by calling **submit_plan** with:\n` +
+        `   - planTaskId: \`${planTaskId}\`\n` +
+        `   - mode: "task"\n` +
+        `   - acceptanceCriteria: your final criteria (markdown bullets)\n` +
+        `   - planMarkdown: the \`plan.md\` body you wrote\n` +
+        `   - tasks: [] unless the work genuinely needs extra sub-tasks (only then, 1-5 items with title/description/verification).\n` +
+        `8. Post a one-paragraph summary comment, then STOP. Do NOT change the task status, do NOT execute.\n` +
+        `\n## TeamShare brief\n${brief || "(no brief available)"}`);
+}
+function buildOverviewPrompt(planTaskId, projectName, queue) {
+    const queueBlock = queue
+        .map((t, i) => `${i + 1}. id=\`${t.id}\` — **${t.title}**\n` +
+        (t.description
+            ? `   - ${t.description.replace(/\s+/g, " ").slice(0, 600)}\n`
+            : "") +
+        (t.acceptanceCriteria
+            ? `   - acceptance: ${t.acceptanceCriteria.replace(/\s+/g, " ").slice(0, 400)}\n`
+            : ""))
+        .join("\n");
+    return (`${PLANNING_RULES}\n\n` +
+        `## Plan task (pass this exact id to submit_plan)\n` +
+        `- **planTaskId:** ${planTaskId}\n` +
+        `- **Project:** ${projectName}\n` +
+        `- **This is an OVERVIEW plan for a whole batch.** The tasks below are the execution queue and ALREADY EXIST.\n` +
+        `\n## Execution queue (${queue.length} tasks — these are the queue, do NOT create replacements)\n${queueBlock}\n` +
+        `\n## What to do (plan only)\n` +
+        `1. Read every task above (get_task with include comments/subtasks/checklist). Read linked documents and the project context.\n` +
+        `2. Research the codebase enough to sequence the work correctly (shared files, ordering constraints, risks).\n` +
+        `3. Decide the execution ORDER of the given task ids and any dependency edges between them.\n` +
+        `4. Write the shared plan: goal, the ordered steps (referencing the existing tasks by title), cross-task risks, and how each task will be verified.\n` +
+        `5. Persist it: create_document with a note named \`plan.md\` under \`agents/<you>/tasks/${planTaskId}\`, and update_task on the plan task with the description + acceptance criteria.\n` +
+        `6. Finish by calling **submit_plan** with:\n` +
+        `   - planTaskId: \`${planTaskId}\`\n` +
+        `   - mode: "overview"\n` +
+        `   - orderedTaskIds: the given task ids in execution order (use the EXACT ids above)\n` +
+        `   - dependencies: [[taskId, dependsOnTaskId], ...] between the given ids (may be empty)\n` +
+        `   - acceptanceCriteria: criteria for the whole plan\n` +
+        `   - planMarkdown: the \`plan.md\` body\n` +
+        `   - tasks: [] — do NOT propose replacement tasks.\n` +
+        `7. Post a one-paragraph summary comment on the plan task, then STOP.\n`);
+}
 async function cmdPlanner(flags) {
-    const agentId = (0, utils_1.need)(flags, 'agent');
-    const projectId = (0, utils_1.need)(flags, 'project');
-    const parentTaskId = (0, utils_1.need)(flags, 'task');
+    const agentId = (0, utils_1.need)(flags, "agent");
+    const projectId = (0, utils_1.need)(flags, "project");
+    const planTaskId = (0, utils_1.need)(flags, "task");
+    const mode = flags.get("mode") === "overview" ? "overview" : "task";
+    const queueIds = (flags.get("tasks") ?? "")
+        .split(",")
+        .map((s) => s.trim())
+        .filter(Boolean);
     const apiKey = (0, utils_1.resolveApiKey)(flags);
-    const selfMode = flags.get('self') === 'true';
-    const resultPath = flags.get('result-file') ?? (0, node_path_1.join)((0, node_os_1.homedir)(), '.teamshare', 'state', `planner-${parentTaskId.slice(0, 8)}.json`);
+    const resultPath = flags.get("result-file") ??
+        (0, node_path_1.join)((0, node_os_1.homedir)(), ".teamshare", "state", `planner-${planTaskId.slice(0, 8)}.json`);
     let exitCode = 0;
-    const sessionId = flags.get('session') ?? (0, session_stream_1.newSessionId)();
-    const reporter = new daemon_reporter_1.DaemonReporter({ sessionId, agentId, projectId, mode: 'run' });
+    const sessionId = flags.get("session") ?? (0, session_stream_1.newSessionId)();
+    const reporter = new daemon_reporter_1.DaemonReporter({
+        sessionId,
+        agentId,
+        projectId,
+        mode: "run",
+    });
     reporter.connect();
     const log = (0, utils_1.makeLog)(reporter);
     const api = new api_1.TeamshareApi(process.env.TEAMSHARE_API_URL, apiKey);
@@ -89,7 +176,7 @@ async function cmdPlanner(flags) {
     const settings = await (0, utils_1.fetchAgentSettings)(api, agentId, log);
     const harness = (0, utils_1.harnessOf)(flags, settings);
     (0, utils_1.applyOpenCodeKey)(agentId, log, settings);
-    const lock = await (0, lock_1.acquireLock)(agentId, 'orchestrator', { projectId, taskId: parentTaskId }, {
+    const lock = await (0, lock_1.acquireLock)(agentId, "orchestrator", { projectId, taskId: planTaskId }, {
         onWaiting: (busy) => log(`[lock] agent ${agentId} is busy (pid ${busy.pid}, since ${busy.startedAt}, ${busy.kind}) - waiting...`),
     });
     if (!lock) {
@@ -98,80 +185,101 @@ async function cmdPlanner(flags) {
         return;
     }
     try {
-        (0, presence_1.registerPresence)(cwd, { agentId, kind: 'orchestrator', projectId });
-        await (0, brief_1.reportStatus)(api, agentId, 'working', parentTaskId, sessionId);
-        log(`[planner] decomposing task ${parentTaskId.slice(0, 8)} in ${cwd}`);
-        // Fetch the task brief for context.
-        const brief = await (0, brief_1.fetchTaskBrief)(api, parentTaskId).catch(() => '');
-        const description = brief || `Task ${parentTaskId}`;
-        const prompt = PLANNER_PROMPT_TEMPLATE.replace('{description}', description);
+        (0, presence_1.registerPresence)(cwd, { agentId, kind: "orchestrator", projectId });
+        await (0, brief_1.reportStatus)(api, agentId, "working", planTaskId, sessionId);
+        const project = await api.getProject(projectId).catch(() => null);
+        const projectName = project?.name ?? projectId;
+        // Fetch the plan task for context.
+        const task = await api.getTask(planTaskId).catch(() => null);
+        if (!task) {
+            log(`[planner] cannot fetch plan task ${planTaskId}`, "stderr");
+            process.exitCode = 1;
+            return;
+        }
+        // Build the prompt.
+        let prompt;
+        if (mode === "overview") {
+            const queue = await Promise.all(queueIds.map(async (id) => {
+                const t = await api.getTask(id).catch(() => null);
+                return {
+                    id,
+                    title: t?.title ?? id,
+                    description: t?.description ?? null,
+                    acceptanceCriteria: t?.acceptanceCriteria ?? null,
+                };
+            }));
+            prompt = buildOverviewPrompt(planTaskId, projectName, queue);
+            log(`[planner] overview mode: planning a queue of ${queue.length} tasks`);
+        }
+        else {
+            const brief = await (0, brief_1.fetchTaskBrief)(api, planTaskId).catch(() => "");
+            prompt = buildTaskPrompt(planTaskId, task, projectName, brief);
+            log(`[planner] task mode: planning task ${planTaskId.slice(0, 8)} in ${cwd}`);
+        }
+        // Mirror the prompt locally so it can be inspected.
+        if (cwd) {
+            try {
+                (0, node_fs_1.mkdirSync)((0, node_path_1.join)(cwd, "teamshare", "plans", planTaskId), {
+                    recursive: true,
+                });
+                (0, node_fs_1.writeFileSync)((0, node_path_1.join)(cwd, "teamshare", "plans", planTaskId, "plan-prompt.md"), prompt, "utf8");
+            }
+            catch {
+                /* best-effort */
+            }
+        }
+        // Clear any stale result file so we never read a previous plan.
+        try {
+            if ((0, node_fs_1.existsSync)(resultPath))
+                (0, node_fs_1.unlinkSync)(resultPath);
+        }
+        catch {
+            /* ignore */
+        }
         const heartbeatTimer = setInterval(() => {
-            void (0, brief_1.reportStatus)(api, agentId, 'working', parentTaskId, sessionId);
+            void (0, brief_1.reportStatus)(api, agentId, "working", planTaskId, sessionId);
         }, 120_000);
         try {
-            const endpoint = (0, utils_1.llmEndpoint)(flags, settings);
-            let plan = null;
-            if (harness && harness !== 'none') {
-                log(`[planner] spawning ${harness} harness for decomposition`);
-                // Spawn the harness. The agent will call submit_plan which writes
-                // the validated plan to a temp file. We wait for the file to appear.
+            if (harness && harness !== "none") {
+                log(`[planner] spawning ${harness} harness for ${mode} planning`);
                 const exit = await (0, harness_1.spawnHarness)(harness, prompt, log, {
                     model: (0, utils_1.modelOf)(flags, settings),
                     temperature: (0, utils_1.temperatureOf)(flags, settings),
                     effort: (0, utils_1.effortOf)(flags, settings) ?? (0, utils_1.defaultEffort)(harness),
                     cwd,
                     timeoutMin: (0, utils_1.sessionTimeoutMin)(flags),
-                    title: `Planner decomposition for task ${parentTaskId.slice(0, 8)}`,
+                    title: `Planner ${mode} for task ${planTaskId.slice(0, 8)}`,
                     agentKey: apiKey,
                     apiBaseUrl: api.baseUrl,
                     providerKey: settings.providerKey ?? undefined,
-                    sessionMode: 'run',
+                    sessionMode: "run",
                     sessionId,
                 });
-                // Read the result file written by submit_plan.
-                plan = readResultFile(resultPath, log);
-                if (!plan && exit !== 0) {
-                    log(`[planner] WARNING: harness exited with code ${exit} and no plan file found at ${resultPath}`, 'stderr');
-                }
-                else if (!plan) {
-                    log(`[planner] WARNING: harness exited successfully but no plan file found at ${resultPath}`, 'stderr');
+                if (exit !== 0) {
+                    log(`[planner] WARNING: harness exited with code ${exit}`, "stderr");
                 }
             }
             else {
-                log(`[planner] WARNING: no harness binary found on PATH — falling back to headless LLM (install opencode or set harness in agent settings)`, 'stderr');
-            }
-            // Fall back to headless LLM if harness didn't produce a plan.
-            if (!plan) {
-                log(`[planner] falling back to headless LLM (harness did not produce a plan)`);
-                plan = await runHeadlessPlanner(prompt, {
-                    baseUrl: endpoint.baseUrl,
-                    apiKey: (0, utils_1.sessionLlmApiKey)(settings),
-                    model: endpoint.model,
-                    temperature: (0, utils_1.temperatureOf)(flags, settings),
-                    maxTokens: (0, utils_1.maxTokensOf)(flags, settings),
-                }, log);
-            }
-            if (plan && plan.length > 0) {
-                // Write the final result for the bridge to read.
-                (0, node_fs_1.writeFileSync)(resultPath, JSON.stringify({ tasks: plan }), 'utf-8');
-                log(`[planner] plan ready: ${plan.length} subtasks -> ${resultPath}`);
-            }
-            else {
-                // Single-node fallback.
-                const fallback = [{ title: description.slice(0, 200), description, dependencies: [], verification: [] }];
-                (0, node_fs_1.writeFileSync)(resultPath, JSON.stringify({ tasks: fallback }), 'utf-8');
-                log(`[planner] fallback: single node -> ${resultPath}`);
+                log(`[planner] WARNING: no harness binary found on PATH — the planner cannot run (install opencode or set the harness in agent settings)`, "stderr");
             }
+            // Read the plan the agent submitted. If it did not submit one, keep the
+            // given queue unchanged — never invent replacement tasks.
+            const result = readResultFile(resultPath, mode, queueIds, log);
+            (0, node_fs_1.writeFileSync)(resultPath, JSON.stringify(result), "utf-8");
+            log(`[planner] plan ready: mode=${mode} tasks=${result.tasks.length} ordered=${result.orderedTaskIds.length} -> ${resultPath}`);
+            await (0, brief_1.postClosingComment)(api, planTaskId, mode === "overview"
+                ? `[plan] Overview plan ready for ${queueIds.length} queued task(s); execution order set.`
+                : `[plan] Planning pass finished; description, acceptance criteria, checklist and plan.md updated.`).catch(() => undefined);
         }
         finally {
             clearInterval(heartbeatTimer);
             void api.releaseSessionClaims(sessionId).catch(() => { });
-            await (0, brief_1.reportStatus)(api, agentId, 'online', parentTaskId, sessionId);
+            await (0, brief_1.reportStatus)(api, agentId, "online", planTaskId, sessionId);
         }
     }
     catch (err) {
-        const { msg } = await Promise.resolve().then(() => __importStar(require('../../lib/config')));
-        log(`[error] ${msg(err)}`, 'stderr');
+        const { msg } = await Promise.resolve().then(() => __importStar(require("../../lib/config")));
+        log(`[error] ${msg(err)}`, "stderr");
         exitCode = 1;
     }
     finally {
@@ -180,68 +288,65 @@ async function cmdPlanner(flags) {
         await reporter.end(exitCode);
     }
 }
-/** Read the plan from the result file written by submit_plan MCP tool. */
-function readResultFile(resultPath, log) {
-    try {
-        const raw = (0, node_fs_1.readFileSync)(resultPath, 'utf-8');
-        const parsed = JSON.parse(raw);
-        const tasks = parsed?.tasks;
-        if (!Array.isArray(tasks) || tasks.length === 0)
-            return null;
-        // Validate and normalize.
-        return tasks.map((node, i) => ({
-            title: String(node.title ?? `Step ${i + 1}`).slice(0, 200),
-            description: String(node.description ?? ''),
-            dependencies: Array.isArray(node.dependencies)
-                ? node.dependencies.filter((d) => Number.isInteger(d) && d >= 0 && d < tasks.length && d !== i)
-                : [],
-            verification: Array.isArray(node.verification)
-                ? node.verification.filter((v) => v.trim().length > 0)
-                : [],
-        }));
-    }
-    catch {
-        log(`[planner] result file not found or invalid: ${resultPath}`, 'stderr');
-        return null;
-    }
-}
+/** Resolve the agent API key from flags (mirrors the shared helper). */
 /**
- * Headless planner fallback: uses the complete() LLM call directly (no
- * harness, no MCP tools). Returns the parsed plan.
+ * Read + normalize the plan the agent submitted via `submit_plan`. When no
+ * plan was submitted the given queue is preserved untouched (no invented
+ * tasks) so the run still proceeds.
  */
-async function runHeadlessPlanner(prompt, llmOpts, log) {
+function readResultFile(resultPath, mode, queueIds, log) {
+    const fallback = {
+        tasks: [],
+        orderedTaskIds: queueIds,
+        dependencies: [],
+    };
+    if (!(0, node_fs_1.existsSync)(resultPath)) {
+        log(`[planner] no plan submitted - keeping the given queue order`, "stderr");
+        return fallback;
+    }
     try {
-        const raw = await (0, llm_1.complete)(prompt, {
-            baseUrl: llmOpts.baseUrl,
-            apiKey: llmOpts.apiKey,
-            model: llmOpts.model,
-            temperature: llmOpts.temperature ?? 0.2,
-            maxTokens: llmOpts.maxTokens ?? 2000,
-        });
-        const cleaned = raw.replace(/```json/gi, '').replace(/```/g, '').trim();
-        const start = cleaned.indexOf('[');
-        const end = cleaned.lastIndexOf(']');
-        if (start < 0 || end <= start) {
-            log('[planner] headless LLM returned unparseable response', 'stderr');
-            return null;
-        }
-        const parsed = JSON.parse(cleaned.slice(start, end + 1));
-        if (!Array.isArray(parsed) || parsed.length === 0)
-            return null;
-        return parsed.map((node, i) => ({
-            title: String(node.title ?? `Step ${i + 1}`).slice(0, 200),
-            description: String(node.description ?? ''),
+        const parsed = JSON.parse((0, node_fs_1.readFileSync)(resultPath, "utf-8"));
+        const rawTasks = Array.isArray(parsed.tasks)
+            ? parsed.tasks
+            : [];
+        const tasks = rawTasks.map((node, i) => ({
+            title: sanitizeTitle(String(node.title ?? ""), `Step ${i + 1}`),
+            description: String(node.description ?? ""),
             dependencies: Array.isArray(node.dependencies)
-                ? node.dependencies.filter((d) => Number.isInteger(d) && d >= 0 && d < parsed.length && d !== i)
+                ? node.dependencies.filter((d) => Number.isInteger(d) && d >= 0 && d < rawTasks.length && d !== i)
                 : [],
             verification: Array.isArray(node.verification)
-                ? node.verification.filter((v) => String(v).trim().length > 0).map(String)
+                ? node.verification.filter((v) => v.trim().length > 0)
                 : [],
         }));
+        const ordered = Array.isArray(parsed.orderedTaskIds)
+            ? parsed.orderedTaskIds
+                .map(String)
+                .filter((id) => queueIds.includes(id))
+            : [];
+        const known = new Set(queueIds);
+        const dependencies = Array.isArray(parsed.dependencies)
+            ? parsed.dependencies.filter((e) => Array.isArray(e) &&
+                e.length === 2 &&
+                e[0] !== e[1] &&
+                known.has(e[0]) &&
+                known.has(e[1]))
+            : [];
+        return {
+            tasks: mode === "overview" ? [] : tasks,
+            orderedTaskIds: ordered.length ? ordered : queueIds,
+            dependencies,
+            planMarkdown: typeof parsed.planMarkdown === "string"
+                ? parsed.planMarkdown
+                : undefined,
+            acceptanceCriteria: typeof parsed.acceptanceCriteria === "string"
+                ? parsed.acceptanceCriteria
+                : undefined,
+        };
     }
-    catch (err) {
-        log(`[planner] headless LLM failed: ${err instanceof Error ? err.message : String(err)}`, 'stderr');
-        return null;
+    catch {
+        log(`[planner] result file invalid: ${resultPath}`, "stderr");
+        return fallback;
     }
 }
 //# sourceMappingURL=planner.js.map

package/dist/cli/commands/planner.js.map

@@ -1 +1 @@
-{"version":3,"file":"planner.js","sourceRoot":"","sources":["../../../src/cli/commands/planner.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA0CA,gCAwHC;AAlKD;;;;;;;;;;;GAWG;AACH,qCAAiE;AACjE,yCAAiC;AACjC,qCAAkC;AAClC,uCAA8D;AAC9D,2CAA6C;AAC7C,yCAA0D;AAC1D,oEAAgE;AAChE,kEAA6D;AAC7D,2CAA+D;AAC/D,oCAIkB;AAClB,uCAAyC;AACzC,qCAA6C;AAC7C,2DAAoF;AAEpF,MAAM,uBAAuB,GAAG;;;;;;;;;;oBAUZ,CAAC;AAEd,KAAK,UAAU,UAAU,CAAC,KAA0B;IACzD,MAAM,OAAO,GAAG,IAAA,YAAI,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,IAAA,YAAI,EAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACzC,MAAM,YAAY,GAAG,IAAA,YAAI,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACzC,MAAM,MAAM,GAAG,IAAA,qBAAa,EAAC,KAAK,CAAC,CAAC;IACpC,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,MAAM,CAAC;IAC9C,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,IAAA,gBAAI,EAAC,IAAA,iBAAO,GAAE,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;IAElI,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,IAAA,6BAAY,GAAE,CAAC;IACzD,MAAM,QAAQ,GAAG,IAAI,gCAAc,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACpF,QAAQ,CAAC,OAAO,EAAE,CAAC;IACnB,MAAM,GAAG,GAAG,IAAA,eAAO,EAAC,QAAQ,CAAC,CAAC;IAC9B,MAAM,GAAG,GAAG,IAAI,kBAAY,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;IAEpE,MAAM,GAAG,GAAG,IAAA,0BAAiB,EAAC,KAAK,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;IACrD,IAAI,CAAC,GAAG;QAAE,OAAO;IAEjB,MAAM,QAAQ,GAAG,MAAM,IAAA,0BAAkB,EAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,IAAA,iBAAS,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC3C,IAAA,wBAAgB,EAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;IAEzC,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAW,EAAC,OAAO,EAAE,cAAc,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE;QAC3F,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAClB,GAAG,CAAC,gBAAgB,OAAO,iBAAiB,IAAI,CAAC,GAAG,WAAW,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,IAAI,gBAAgB,CAAC;KAC/G,CAAC,CAAC;IACH,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,CAAC,KAAK,CAAC,oCAAoC,OAAO,oBAAoB,CAAC,CAAC;QAC/E,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrB,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,IAAA,2BAAgB,EAAC,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC,CAAC;QACpE,MAAM,IAAA,oBAAY,EAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;QACrE,GAAG,CAAC,8BAA8B,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;QAExE,oCAAoC;QACpC,MAAM,KAAK,GAAG,MAAM,IAAA,sBAAc,EAAC,GAAG,EAAE,YAAY,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QACtE,MAAM,WAAW,GAAG,KAAK,IAAI,QAAQ,YAAY,EAAE,CAAC;QACpD,MAAM,MAAM,GAAG,uBAAuB,CAAC,OAAO,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;QAE7E,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE;YACtC,KAAK,IAAA,oBAAY,EAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;QACtE,CAAC,EAAE,OAAO,CAAC,CAAC;QAEZ,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,IAAA,mBAAW,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAC9C,IAAI,IAAI,GAKI,IAAI,CAAC;YAEjB,IAAI,OAAO,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;gBAClC,GAAG,CAAC,sBAAsB,OAAO,4BAA4B,CAAC,CAAC;gBAC/D,kEAAkE;gBAClE,qEAAqE;gBACrE,MAAM,IAAI,GAAG,MAAM,IAAA,sBAAY,EAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE;oBACpD,KAAK,EAAE,IAAA,eAAO,EAAC,KAAK,EAAE,QAAQ,CAAC;oBAC/B,WAAW,EAAE,IAAA,qBAAa,EAAC,KAAK,EAAE,QAAQ,CAAC;oBAC3C,MAAM,EAAE,IAAA,gBAAQ,EAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,IAAA,qBAAa,EAAC,OAAO,CAAC;oBAC3D,GAAG;oBACH,UAAU,EAAE,IAAA,yBAAiB,EAAC,KAAK,CAAC;oBACpC,KAAK,EAAE,kCAAkC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;oBACnE,QAAQ,EAAE,MAAM;oBAChB,UAAU,EAAE,GAAG,CAAC,OAAO;oBACvB,WAAW,EAAE,QAAQ,CAAC,WAAW,IAAI,SAAS;oBAC9C,WAAW,EAAE,KAAK;oBAClB,SAAS;iBACV,CAAC,CAAC;gBAEH,+CAA+C;gBAC/C,IAAI,GAAG,cAAc,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;gBACvC,IAAI,CAAC,IAAI,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;oBACxB,GAAG,CAAC,+CAA+C,IAAI,8BAA8B,UAAU,EAAE,EAAE,QAAQ,CAAC,CAAC;gBAC/G,CAAC;qBAAM,IAAI,CAAC,IAAI,EAAE,CAAC;oBACjB,GAAG,CAAC,4EAA4E,UAAU,EAAE,EAAE,QAAQ,CAAC,CAAC;gBAC1G,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,uIAAuI,EAAE,QAAQ,CAAC,CAAC;YACzJ,CAAC;YAED,8DAA8D;YAC9D,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,GAAG,CAAC,yEAAyE,CAAC,CAAC;gBAC/E,IAAI,GAAG,MAAM,kBAAkB,CAAC,MAAM,EAAE;oBACtC,OAAO,EAAE,QAAQ,CAAC,OAAO;oBACzB,MAAM,EAAE,IAAA,wBAAgB,EAAC,QAAQ,CAAC;oBAClC,KAAK,EAAE,QAAQ,CAAC,KAAK;oBACrB,WAAW,EAAE,IAAA,qBAAa,EAAC,KAAK,EAAE,QAAQ,CAAC;oBAC3C,SAAS,EAAE,IAAA,mBAAW,EAAC,KAAK,EAAE,QAAQ,CAAC;iBACxC,EAAE,GAAG,CAAC,CAAC;YACV,CAAC;YAED,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC5B,iDAAiD;gBACjD,IAAA,uBAAa,EAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;gBACpE,GAAG,CAAC,yBAAyB,IAAI,CAAC,MAAM,gBAAgB,UAAU,EAAE,CAAC,CAAC;YACxE,CAAC;iBAAM,CAAC;gBACN,wBAAwB;gBACxB,MAAM,QAAQ,GAAG,CAAC,EAAE,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;gBACzG,IAAA,uBAAa,EAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;gBACxE,GAAG,CAAC,sCAAsC,UAAU,EAAE,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,aAAa,CAAC,cAAc,CAAC,CAAC;YAC9B,KAAK,GAAG,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YACzD,MAAM,IAAA,oBAAY,EAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;QACtE,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,EAAE,GAAG,EAAE,GAAG,wDAAa,kBAAkB,GAAC,CAAC;QACjD,GAAG,CAAC,WAAW,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QACrC,QAAQ,GAAG,CAAC,CAAC;IACf,CAAC;YAAS,CAAC;QACT,IAAA,6BAAkB,EAAC,GAAG,CAAC,CAAC;QACxB,IAAA,kBAAW,EAAC,OAAO,CAAC,CAAC;QACrB,MAAM,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;AACH,CAAC;AAED,0EAA0E;AAC1E,SAAS,cAAc,CACrB,UAAkB,EAClB,GAAwD;IAOxD,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAA,sBAAY,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,KAAK,GAAG,MAAM,EAAE,KAAK,CAAC;QAC5B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAE7D,0BAA0B;QAC1B,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAA6B,EAAE,CAAS,EAAE,EAAE,CAAC,CAAC;YAC9D,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;YAC1D,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC;YAC3C,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC;gBAC5C,CAAC,CAAE,IAAI,CAAC,YAAyB,CAAC,MAAM,CACpC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,CACpE;gBACH,CAAC,CAAC,EAAE;YACN,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC;gBAC5C,CAAC,CAAE,IAAI,CAAC,YAAyB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;gBACpE,CAAC,CAAC,EAAE;SACP,CAAC,CAAC,CAAC;IACN,CAAC;IAAC,MAAM,CAAC;QACP,GAAG,CAAC,+CAA+C,UAAU,EAAE,EAAE,QAAQ,CAAC,CAAC;QAC3E,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,KAAK,UAAU,kBAAkB,CAC/B,MAAc,EACd,OAAqG,EACrG,GAAwD;IAOxD,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,IAAA,cAAQ,EAAC,MAAM,EAAE;YACjC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,GAAG;YACvC,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,IAAI;SACrC,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACxE,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,KAAK,GAAG,CAAC,IAAI,GAAG,IAAI,KAAK,EAAE,CAAC;YAC9B,GAAG,CAAC,sDAAsD,EAAE,QAAQ,CAAC,CAAC;YACtE,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,GAAG,CAAC,CAAC,CAKrD,CAAC;QAEH,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAE/D,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YAC9B,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;YAC1D,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC;YAC3C,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC;gBAC5C,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC;gBAChG,CAAC,CAAC,EAAE;YACN,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC;gBAC5C,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC;gBAC1E,CAAC,CAAC,EAAE;SACP,CAAC,CAAC,CAAC;IACN,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,GAAG,CAAC,kCAAkC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QACpG,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
+{"version":3,"file":"planner.js","sourceRoot":"","sources":["../../../src/cli/commands/planner.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2LA,gCAkLC;AA7WD;;;;;;;;;;;;;;;GAeG;AACH,qCAMiB;AACjB,yCAAiC;AACjC,qCAAkC;AAClC,uCAA6C;AAC7C,2CAIyB;AACzB,yCAA0D;AAC1D,oEAAgE;AAChE,kEAA6D;AAC7D,oCAYkB;AAClB,uCAAyC;AACzC,qCAA6C;AAC7C,2DAGsC;AAItC,SAAS,aAAa,CAAC,GAAW,EAAE,QAAgB;IAClD,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC;SAC1B,KAAK,CAAC,OAAO,CAAC;SACd,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC7B,MAAM,OAAO,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC;SAC9B,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC;SAC1B,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;SACvB,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;SACpB,IAAI,EAAE,CAAC;IACV,MAAM,KAAK,GACT,OAAO;QACP,CAAC,GAAG,IAAI,EAAE,CAAC;aACR,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;aACvB,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;aACpB,IAAI,EAAE,CAAC;IACZ,IAAI,CAAC,KAAK;QAAE,OAAO,QAAQ,CAAC;IAC5B,OAAO,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;AAChE,CAAC;AAED,2EAA2E;AAC3E,MAAM,cAAc,GAAG;;;;;;uJAMgI,CAAC;AAExJ,SAAS,eAAe,CACtB,UAAkB,EAClB,IAOC,EACD,WAAmB,EACnB,KAAa;IAEb,OAAO,CACL,GAAG,cAAc,MAAM;QACvB,mEAAmE;QACnE,qBAAqB,UAAU,IAAI;QACnC,kBAAkB,WAAW,IAAI;QACjC,gBAAgB,IAAI,CAAC,KAAK,IAAI;QAC9B,iBAAiB,IAAI,CAAC,MAAM,oBAAoB,IAAI,CAAC,QAAQ,IAAI;QACjE,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAClE,6BAA6B,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,QAAQ,IAAI;QACrE,qCAAqC,IAAI,CAAC,kBAAkB,EAAE,IAAI,EAAE,IAAI,QAAQ,IAAI;QACpF,+BAA+B;QAC/B,0IAA0I;QAC1I,2IAA2I;QAC3I,yHAAyH;QACzH,wHAAwH;QACxH,0HAA0H;QAC1H,oGAAoG,UAAU,oDAAoD;QAClK,8CAA8C;QAC9C,sBAAsB,UAAU,MAAM;QACtC,qBAAqB;QACrB,mEAAmE;QACnE,qDAAqD;QACrD,8HAA8H;QAC9H,sGAAsG;QACtG,yBAAyB,KAAK,IAAI,sBAAsB,EAAE,CAC3D,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAC1B,UAAkB,EAClB,WAAmB,EACnB,KAKE;IAEF,MAAM,UAAU,GAAG,KAAK;SACrB,GAAG,CACF,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACP,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,KAAK,MAAM;QAC7C,CAAC,CAAC,CAAC,WAAW;YACZ,CAAC,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI;YAC9D,CAAC,CAAC,EAAE,CAAC;QACP,CAAC,CAAC,CAAC,kBAAkB;YACnB,CAAC,CAAC,oBAAoB,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI;YACjF,CAAC,CAAC,EAAE,CAAC,CACV;SACA,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,OAAO,CACL,GAAG,cAAc,MAAM;QACvB,oDAAoD;QACpD,qBAAqB,UAAU,IAAI;QACnC,kBAAkB,WAAW,IAAI;QACjC,gHAAgH;QAChH,yBAAyB,KAAK,CAAC,MAAM,8DAA8D,UAAU,IAAI;QACjH,+BAA+B;QAC/B,gIAAgI;QAChI,+GAA+G;QAC/G,8FAA8F;QAC9F,sJAAsJ;QACtJ,2FAA2F,UAAU,oFAAoF;QACzL,8CAA8C;QAC9C,sBAAsB,UAAU,MAAM;QACtC,yBAAyB;QACzB,wFAAwF;QACxF,4FAA4F;QAC5F,wDAAwD;QACxD,2CAA2C;QAC3C,sDAAsD;QACtD,wEAAwE,CACzE,CAAC;AACJ,CAAC;AAeM,KAAK,UAAU,UAAU,CAAC,KAA0B;IACzD,MAAM,OAAO,GAAG,IAAA,YAAI,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,IAAA,YAAI,EAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACzC,MAAM,UAAU,GAAG,IAAA,YAAI,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACvC,MAAM,IAAI,GAAS,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC;IAC1E,MAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;SACxC,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,OAAO,CAAC,CAAC;IACnB,MAAM,MAAM,GAAG,IAAA,qBAAa,EAAC,KAAK,CAAC,CAAC;IACpC,MAAM,UAAU,GACd,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC;QACxB,IAAA,gBAAI,EACF,IAAA,iBAAO,GAAE,EACT,YAAY,EACZ,OAAO,EACP,WAAW,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CACzC,CAAC;IAEJ,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,IAAA,6BAAY,GAAE,CAAC;IACzD,MAAM,QAAQ,GAAG,IAAI,gCAAc,CAAC;QAClC,SAAS;QACT,OAAO;QACP,SAAS;QACT,IAAI,EAAE,KAAK;KACZ,CAAC,CAAC;IACH,QAAQ,CAAC,OAAO,EAAE,CAAC;IACnB,MAAM,GAAG,GAAG,IAAA,eAAO,EAAC,QAAQ,CAAC,CAAC;IAC9B,MAAM,GAAG,GAAG,IAAI,kBAAY,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;IAEpE,MAAM,GAAG,GAAG,IAAA,0BAAiB,EAAC,KAAK,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;IACrD,IAAI,CAAC,GAAG;QAAE,OAAO;IAEjB,MAAM,QAAQ,GAAG,MAAM,IAAA,0BAAkB,EAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,IAAA,iBAAS,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC3C,IAAA,wBAAgB,EAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;IAEzC,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAW,EAC5B,OAAO,EACP,cAAc,EACd,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,EACjC;QACE,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAClB,GAAG,CACD,gBAAgB,OAAO,iBAAiB,IAAI,CAAC,GAAG,WAAW,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,IAAI,gBAAgB,CACxG;KACJ,CACF,CAAC;IACF,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,CAAC,KAAK,CACX,oCAAoC,OAAO,oBAAoB,CAChE,CAAC;QACF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrB,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,IAAA,2BAAgB,EAAC,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC,CAAC;QACpE,MAAM,IAAA,oBAAY,EAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QAEnE,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QAClE,MAAM,WAAW,GAAG,OAAO,EAAE,IAAI,IAAI,SAAS,CAAC;QAE/C,mCAAmC;QACnC,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QAC7D,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,GAAG,CAAC,oCAAoC,UAAU,EAAE,EAAE,QAAQ,CAAC,CAAC;YAChE,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,OAAO;QACT,CAAC;QAED,oBAAoB;QACpB,IAAI,MAAc,CAAC;QACnB,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;YACxB,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7B,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;gBACxB,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;gBAClD,OAAO;oBACL,EAAE;oBACF,KAAK,EAAE,CAAC,EAAE,KAAK,IAAI,EAAE;oBACrB,WAAW,EAAE,CAAC,EAAE,WAAW,IAAI,IAAI;oBACnC,kBAAkB,EAAE,CAAC,EAAE,kBAAkB,IAAI,IAAI;iBAClD,CAAC;YACJ,CAAC,CAAC,CACH,CAAC;YACF,MAAM,GAAG,mBAAmB,CAAC,UAAU,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;YAC7D,GAAG,CAAC,gDAAgD,KAAK,CAAC,MAAM,QAAQ,CAAC,CAAC;QAC5E,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,GAAG,MAAM,IAAA,sBAAc,EAAC,GAAG,EAAE,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;YACpE,MAAM,GAAG,eAAe,CAAC,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;YAC/D,GAAG,CACD,sCAAsC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,GAAG,EAAE,CACzE,CAAC;QACJ,CAAC;QAED,oDAAoD;QACpD,IAAI,GAAG,EAAE,CAAC;YACR,IAAI,CAAC;gBACH,IAAA,mBAAS,EAAC,IAAA,gBAAI,EAAC,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE;oBACrD,SAAS,EAAE,IAAI;iBAChB,CAAC,CAAC;gBACH,IAAA,uBAAa,EACX,IAAA,gBAAI,EAAC,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,gBAAgB,CAAC,EAC7D,MAAM,EACN,MAAM,CACP,CAAC;YACJ,CAAC;YAAC,MAAM,CAAC;gBACP,iBAAiB;YACnB,CAAC;QACH,CAAC;QAED,gEAAgE;QAChE,IAAI,CAAC;YACH,IAAI,IAAA,oBAAU,EAAC,UAAU,CAAC;gBAAE,IAAA,oBAAU,EAAC,UAAU,CAAC,CAAC;QACrD,CAAC;QAAC,MAAM,CAAC;YACP,YAAY;QACd,CAAC;QAED,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE;YACtC,KAAK,IAAA,oBAAY,EAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QACpE,CAAC,EAAE,OAAO,CAAC,CAAC;QAEZ,IAAI,CAAC;YACH,IAAI,OAAO,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;gBAClC,GAAG,CAAC,sBAAsB,OAAO,gBAAgB,IAAI,WAAW,CAAC,CAAC;gBAClE,MAAM,IAAI,GAAG,MAAM,IAAA,sBAAY,EAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE;oBACpD,KAAK,EAAE,IAAA,eAAO,EAAC,KAAK,EAAE,QAAQ,CAAC;oBAC/B,WAAW,EAAE,IAAA,qBAAa,EAAC,KAAK,EAAE,QAAQ,CAAC;oBAC3C,MAAM,EAAE,IAAA,gBAAQ,EAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,IAAA,qBAAa,EAAC,OAAO,CAAC;oBAC3D,GAAG;oBACH,UAAU,EAAE,IAAA,yBAAiB,EAAC,KAAK,CAAC;oBACpC,KAAK,EAAE,WAAW,IAAI,aAAa,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;oBAC3D,QAAQ,EAAE,MAAM;oBAChB,UAAU,EAAE,GAAG,CAAC,OAAO;oBACvB,WAAW,EAAE,QAAQ,CAAC,WAAW,IAAI,SAAS;oBAC9C,WAAW,EAAE,KAAK;oBAClB,SAAS;iBACV,CAAC,CAAC;gBACH,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;oBACf,GAAG,CAAC,+CAA+C,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC;gBACvE,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,GAAG,CACD,qIAAqI,EACrI,QAAQ,CACT,CAAC;YACJ,CAAC;YAED,wEAAwE;YACxE,0DAA0D;YAC1D,MAAM,MAAM,GAAG,cAAc,CAAC,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;YAC/D,IAAA,uBAAa,EAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;YAC3D,GAAG,CACD,8BAA8B,IAAI,UAAU,MAAM,CAAC,KAAK,CAAC,MAAM,YAAY,MAAM,CAAC,cAAc,CAAC,MAAM,OAAO,UAAU,EAAE,CAC3H,CAAC;YAEF,MAAM,IAAA,0BAAkB,EACtB,GAAG,EACH,UAAU,EACV,IAAI,KAAK,UAAU;gBACjB,CAAC,CAAC,kCAAkC,QAAQ,CAAC,MAAM,uCAAuC;gBAC1F,CAAC,CAAC,iGAAiG,CACtG,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAC3B,CAAC;gBAAS,CAAC;YACT,aAAa,CAAC,cAAc,CAAC,CAAC;YAC9B,KAAK,GAAG,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YACzD,MAAM,IAAA,oBAAY,EAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,EAAE,GAAG,EAAE,GAAG,wDAAa,kBAAkB,GAAC,CAAC;QACjD,GAAG,CAAC,WAAW,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QACrC,QAAQ,GAAG,CAAC,CAAC;IACf,CAAC;YAAS,CAAC;QACT,IAAA,6BAAkB,EAAC,GAAG,CAAC,CAAC;QACxB,IAAA,kBAAW,EAAC,OAAO,CAAC,CAAC;QACrB,MAAM,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;AACH,CAAC;AAED,wEAAwE;AACxE;;;;GAIG;AACH,SAAS,cAAc,CACrB,UAAkB,EAClB,IAAU,EACV,QAAkB,EAClB,GAAwD;IAExD,MAAM,QAAQ,GAAe;QAC3B,KAAK,EAAE,EAAE;QACT,cAAc,EAAE,QAAQ;QACxB,YAAY,EAAE,EAAE;KACjB,CAAC;IACF,IAAI,CAAC,IAAA,oBAAU,EAAC,UAAU,CAAC,EAAE,CAAC;QAC5B,GAAG,CACD,6DAA6D,EAC7D,QAAQ,CACT,CAAC;QACF,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,UAAU,EAAE,OAAO,CAAC,CAG1D,CAAC;QACF,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;YAC1C,CAAC,CAAE,MAAM,CAAC,KAAwC;YAClD,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACvC,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/D,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC;YAC3C,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC;gBAC5C,CAAC,CAAE,IAAI,CAAC,YAAyB,CAAC,MAAM,CACpC,CAAC,CAAC,EAAE,EAAE,CACJ,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,CAClE;gBACH,CAAC,CAAC,EAAE;YACN,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC;gBAC5C,CAAC,CAAE,IAAI,CAAC,YAAyB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;gBACpE,CAAC,CAAC,EAAE;SACP,CAAC,CAAC,CAAC;QAEJ,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC;YAClD,CAAC,CAAE,MAAM,CAAC,cAA2B;iBAChC,GAAG,CAAC,MAAM,CAAC;iBACX,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC1C,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QAChC,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC;YACrD,CAAC,CAAE,MAAM,CAAC,YAAwC,CAAC,MAAM,CACrD,CAAC,CAAC,EAAE,EAAE,CACJ,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;gBAChB,CAAC,CAAC,MAAM,KAAK,CAAC;gBACd,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACb,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACf,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAClB;YACH,CAAC,CAAC,EAAE,CAAC;QAEP,OAAO;YACL,KAAK,EAAE,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK;YACvC,cAAc,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;YACnD,YAAY;YACZ,YAAY,EACV,OAAO,MAAM,CAAC,YAAY,KAAK,QAAQ;gBACrC,CAAC,CAAC,MAAM,CAAC,YAAY;gBACrB,CAAC,CAAC,SAAS;YACf,kBAAkB,EAChB,OAAO,MAAM,CAAC,kBAAkB,KAAK,QAAQ;gBAC3C,CAAC,CAAC,MAAM,CAAC,kBAAkB;gBAC3B,CAAC,CAAC,SAAS;SAChB,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,GAAG,CAAC,kCAAkC,UAAU,EAAE,EAAE,QAAQ,CAAC,CAAC;QAC9D,OAAO,QAAQ,CAAC;IAClB,CAAC;AACH,CAAC"}

package/dist/cli/commands/run.js

@@ -90,10 +90,40 @@ async function cmdRun(flags) {
     let gitPrepared;
     let gitPolicy = 'pr';
     let allowMainCommit = false;
+    // Real task context for the safety-net commit (the fetched `task` is
+    // block-scoped inside the try, so capture what the `finally` path needs).
+    let gitTaskTitle;
+    let gitProjectSlug;
     const sessionId = flags.get('session') ?? (0, session_stream_1.newSessionId)();
     const reporter = new daemon_reporter_1.DaemonReporter({ sessionId, agentId, mode: 'run' });
     const log = (0, utils_1.makeLog)(reporter);
     (0, utils_1.applyOpenCodeKey)(agentId, log, settings);
+    /**
+     * Safety-net commit: persist any uncommitted AGENT work to the run's task
+     * branch. MUST run BEFORE the stash pop so it can never sweep the user's
+     * restored dirty files into a commit. The `!s.popped` guard makes it a
+     * no-op once a repo's stash has been restored, so repeated calls are safe,
+     * and it carries the real task title/slug so work never lands on the
+     * placeholder `tasks/task` branch.
+     */
+    const maybeSafetyCommit = async () => {
+        if (!gitPrepared?.active || !presenceCwd)
+            return;
+        if (!stashResults.some((s) => s.stashed && !s.popped))
+            return;
+        const safetyResult = await (0, git_pipeline_1.commitRemainingChanges)(presenceCwd, gitPrepared, {
+            taskId: flags.get('task') ?? '',
+            taskTitle: gitTaskTitle ?? 'task',
+            projectSlug: gitProjectSlug,
+            agentName: agentId,
+            openPr: false,
+            policy: gitPolicy,
+            allowMainBranchCommit: allowMainCommit,
+            log,
+        });
+        for (const line of safetyResult.lines)
+            log(line);
+    };
     try {
         let taskId = flags.get('task');
         if (taskId && !/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(taskId)) {
@@ -120,6 +150,8 @@ async function cmdRun(flags) {
         reporter.meta.projectId = task.projectId ?? undefined;
         reporter.meta.taskId = taskId;
         reporter.connect();
+        gitTaskTitle = task.title;
+        gitProjectSlug = task.project?.name;
         const cwd = (0, shared_1.resolveWorkingDir)(flags, task?.projectId ?? null, log);
         if (!cwd) {
             exitCode = 1;
@@ -321,6 +353,10 @@ async function cmdRun(flags) {
         });
         for (const line of gitResult.lines)
             log(line);
+        // Safety-net commit BEFORE restoring the user's stashed changes, so the
+        // commit only captures agent leftovers (usually a no-op once finalize has
+        // committed) and never the user's dirty files.
+        await maybeSafetyCommit();
         // Pop stashes (reverse order) — restore user's original changes
         for (let i = stashResults.length - 1; i >= 0; i--) {
             stashResults[i] = await (0, git_runner_1.popRepo)(stashResults[i].gitRoot, stashResults[i], cwd, taskId, api, log);
@@ -381,24 +417,10 @@ async function cmdRun(flags) {
         exitCode = 1;
     }
     finally {
-        // Safety-net commit: if the harness failed or exited early, commit any
-        // uncommitted agent work to the task branch BEFORE popping stashes. This
-        // ensures the next run sees a clean tree with the work saved, instead of
-        // stashing and losing the agent's progress.
-        if (gitPrepared?.active && presenceCwd && stashResults.some((s) => s.stashed)) {
-            const taskIdForCommit = flags.get('task') ?? '';
-            const safetyResult = await (0, git_pipeline_1.commitRemainingChanges)(presenceCwd, gitPrepared, {
-                taskId: taskIdForCommit,
-                taskTitle: 'task',
-                agentName: agentId,
-                openPr: false,
-                policy: gitPolicy,
-                allowMainBranchCommit: allowMainCommit,
-                log,
-            });
-            for (const line of safetyResult.lines)
-                log(line);
-        }
+        // Safety-net commit (exception path): save uncommitted agent work to the
+        // task branch BEFORE restoring the user's stashed changes. No-op if the
+        // normal path already committed it, or if a stash has already been popped.
+        await maybeSafetyCommit();
         // Pop stashes — restore user's original changes (only un-popped entries)
         if (stashResults.length && presenceCwd) {
             const taskIdForPop = flags.get('task') ?? '';