@runfusion/fusion 0.54.0 → 0.55.0

package/dist/extension.js

@@ -564,6 +564,66 @@ var init_mcp_config = __esm({
   }
 });
 
+// ../core/src/gitlab-config.ts
+function resolveGitlabEnabled(input = {}) {
+  if (typeof input.project?.gitlabEnabled === "boolean") return input.project.gitlabEnabled;
+  if (typeof input.global?.gitlabEnabled === "boolean") return input.global.gitlabEnabled;
+  return true;
+}
+function readConfiguredString(value) {
+  if (typeof value !== "string") return void 0;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : void 0;
+}
+function normalizeHttpUrl(value, label) {
+  let parsed;
+  try {
+    parsed = new URL(value);
+  } catch {
+    throw new Error(`${label} must be a valid absolute http(s) URL`);
+  }
+  if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
+    throw new Error(`${label} must use http:// or https://`);
+  }
+  if (parsed.username || parsed.password) {
+    throw new Error(`${label} must not include username or password userinfo`);
+  }
+  if (!parsed.hostname) {
+    throw new Error(`${label} must include a hostname`);
+  }
+  parsed.hash = "";
+  parsed.search = "";
+  parsed.pathname = parsed.pathname.replace(/\/+$/u, "") || "/";
+  const normalized = parsed.toString().replace(/\/$/u, "");
+  return normalized;
+}
+function deriveApiBaseUrl(instanceUrl) {
+  const parsed = new URL(instanceUrl);
+  const basePath = parsed.pathname.replace(/\/+$/u, "");
+  parsed.pathname = `${basePath}/api/v4`.replace(/\/+/gu, "/");
+  parsed.search = "";
+  parsed.hash = "";
+  return parsed.toString().replace(/\/$/u, "");
+}
+function resolveGitlabConfig(input = {}) {
+  const enabled = resolveGitlabEnabled(input);
+  const projectInstanceUrl = readConfiguredString(input.project?.gitlabInstanceUrl);
+  const globalInstanceUrl = readConfiguredString(input.global?.gitlabInstanceUrl);
+  const projectApiBaseUrl = readConfiguredString(input.project?.gitlabApiBaseUrl);
+  const globalApiBaseUrl = readConfiguredString(input.global?.gitlabApiBaseUrl);
+  const instanceUrl = normalizeHttpUrl(projectInstanceUrl ?? globalInstanceUrl ?? DEFAULT_GITLAB_INSTANCE_URL, "GitLab instance URL");
+  const apiBaseUrl = projectApiBaseUrl ?? globalApiBaseUrl ? normalizeHttpUrl(projectApiBaseUrl ?? globalApiBaseUrl ?? "", "GitLab API base URL") : instanceUrl === DEFAULT_GITLAB_INSTANCE_URL ? DEFAULT_GITLAB_API_BASE_URL : deriveApiBaseUrl(instanceUrl);
+  return { enabled, instanceUrl, apiBaseUrl };
+}
+var DEFAULT_GITLAB_INSTANCE_URL, DEFAULT_GITLAB_API_BASE_URL;
+var init_gitlab_config = __esm({
+  "../core/src/gitlab-config.ts"() {
+    "use strict";
+    DEFAULT_GITLAB_INSTANCE_URL = "https://gitlab.com";
+    DEFAULT_GITLAB_API_BASE_URL = "https://gitlab.com/api/v4";
+  }
+});
+
 // ../core/src/task-helpers.ts
 function getPrimaryPrInfo(task) {
   return task.prInfos?.[0] ?? task.prInfo;
@@ -1017,7 +1077,11 @@ var init_settings_schema = __esm({
     "use strict";
     init_in_review_stall();
     DEFAULT_GLOBAL_SETTINGS = {
-      themeMode: "dark",
+      /*
+      FNXC:DashboardTheming 2026-07-03-00:00:
+      Fresh installs must follow the operating system theme until the user explicitly chooses Light, Dark, or System. Keep this global default aligned with dashboard and desktop pre-hydration fallbacks.
+      */
+      themeMode: "system",
       /*
       FNXC:DashboardTheming 2026-06-30-00:00:
       New users and unset installs should start on Shadcn Ember. Existing users who explicitly stored colorTheme "default", "ocean", or another valid theme must remain on that selection, so the ids stay valid and only the absence/default seed changes to "shadcn-ember".
@@ -1090,10 +1154,21 @@ var init_settings_schema = __esm({
       updateCheckFrequency: "daily",
       autoReloadOnVersionChange: true,
       githubTrackingDefaultRepo: void 0,
+      gitlabEnabled: void 0,
+      gitlabInstanceUrl: void 0,
+      gitlabApiBaseUrl: void 0,
+      gitlabAuthToken: void 0,
+      gitlabAuthTokenType: void 0,
       modelOnboardingComplete: void 0,
       useClaudeCli: void 0,
       useDroidCli: void 0,
       useLlamaCpp: void 0,
+      useCursorCli: void 0,
+      /*
+      FNXC:CursorCli 2026-07-02-00:00:
+      Cursor CLI binary overrides are global operator settings because executable locations are machine-local. Blank/undefined preserves PATH auto-detection through cursor-agent and cursor.
+      */
+      cursorCliBinaryPath: void 0,
       // Global baseline lanes for per-role model selection
       executionGlobalProvider: void 0,
       executionGlobalModelId: void 0,
@@ -1443,6 +1518,14 @@ var init_settings_schema = __esm({
       githubTrackingEnabledByDefault: false,
       githubLinkImportedIssuesToTracking: false,
       githubTrackingDefaultRepo: void 0,
+      gitlabEnabled: void 0,
+      gitlabInstanceUrl: void 0,
+      gitlabApiBaseUrl: void 0,
+      gitlabAuthToken: void 0,
+      gitlabAuthTokenType: void 0,
+      gitlabCommentOnDone: false,
+      gitlabCommentTemplate: void 0,
+      gitlabCloseSourceIssueOnDone: false,
       githubTrackingDedupEnabled: true,
       githubAuthMode: "gh-cli",
       githubAuthToken: void 0,
@@ -2085,6 +2168,9 @@ function categorizeToolName(toolName) {
   if (name.startsWith("fn_task_import_github") || name.startsWith("fn_task_browse_github")) {
     return "github";
   }
+  if (name.startsWith("fn_task_import_gitlab") || name.startsWith("fn_task_browse_gitlab")) {
+    return "gitlab";
+  }
   if (name === "fn_web_fetch") return "network";
   if (name.startsWith("fn_secret_")) return "secrets";
   if (name.startsWith("fn_skills_")) return "skills";
@@ -2989,12 +3075,13 @@ function validateMessageMetadata(metadata) {
     throw new Error("metadata.wakeRecipient must be a boolean");
   }
 }
-var THINKING_LEVELS, COLUMNS, DEFAULT_COLUMN, TASK_PRIORITIES, DEFAULT_TASK_PRIORITY, WORKFLOW_WORK_ITEM_KINDS, WORKFLOW_WORK_ITEM_STATES, HIGH_FANOUT_BLOCKER_TODO_THRESHOLD, STALE_HIGH_FANOUT_BLOCKER_AGE_THRESHOLD_MS, EXECUTION_MODES, DEFAULT_EXECUTION_MODE, THEME_MODES, COLOR_THEMES, SUPPORTED_LOCALES, DEFAULT_LOCALE, warnedLegacyCwdMain, MERGE_ADVANCE_AUTO_SYNC_MODES, MERGE_STRATEGY_OVERLAP_BEHAVIORS, POST_MERGE_AUDIT_MODES, MERGE_AUDIT_AUTO_RECOVERY_MODES, MERGER_MODES, AUTO_RECOVERY_MODES, NOTIFICATION_EVENTS, DOCUMENT_KEY_RE, REPO_OVERRIDE_RE, CheckoutConflictError, DUPLICATE_OF_METADATA_KEY, WorkspaceTaskMergeError, SHARED_STATE_SNAPSHOT_VERSION, COLUMN_LABELS, COLUMN_DESCRIPTIONS, VALID_TRANSITIONS, AGENT_VALID_TRANSITIONS, AGENT_PERMISSIONS, PERMANENT_AGENT_ACTION_CATEGORIES, AGENT_PERMISSION_POLICY_ACTION_CATEGORIES, AGENT_PERMISSION_POLICY_CATEGORY_TOOL_EXAMPLES, AGENT_PERMISSION_POLICY_EXEMPT_TOOL_EXAMPLES, AGENT_PROVISIONING_APPROVAL_MODES, SECRET_ACCESS_POLICIES, SANDBOX_PROVISIONING_APPROVAL_MODES, AGENT_PERMISSION_POLICY_PRESET_IDS, APPROVAL_REQUEST_STATUSES, APPROVAL_REQUEST_AUDIT_EVENT_TYPES, LEGACY_AGENT_PERMISSION_POLICY_ACTION_CATEGORY_ALIASES, DEFAULT_HEARTBEAT_PROCEDURE_PATH, DASHBOARD_USER_ID, DASHBOARD_USER_ALIASES;
+var THINKING_LEVELS, COLUMNS, DEFAULT_COLUMN, TASK_PRIORITIES, DEFAULT_TASK_PRIORITY, WORKFLOW_WORK_ITEM_KINDS, WORKFLOW_WORK_ITEM_STATES, HIGH_FANOUT_BLOCKER_TODO_THRESHOLD, STALE_HIGH_FANOUT_BLOCKER_AGE_THRESHOLD_MS, EXECUTION_MODES, DEFAULT_EXECUTION_MODE, THEME_MODES, COLOR_THEMES, SUPPORTED_LOCALES, DEFAULT_LOCALE, warnedLegacyCwdMain, MERGE_ADVANCE_AUTO_SYNC_MODES, MERGE_STRATEGY_OVERLAP_BEHAVIORS, POST_MERGE_AUDIT_MODES, MERGE_AUDIT_AUTO_RECOVERY_MODES, MERGER_MODES, AUTO_RECOVERY_MODES, NOTIFICATION_EVENTS, DOCUMENT_KEY_RE, REPO_OVERRIDE_RE, CheckoutConflictError, DUPLICATE_OF_METADATA_KEY, WorkspaceTaskMergeError, SHARED_STATE_SNAPSHOT_VERSION, COLUMN_LABELS, COLUMN_DESCRIPTIONS, VALID_TRANSITIONS, PLANNING_DEEPEN_CHECKPOINT_QUESTION, PLANNING_DEEPEN_CHECKPOINT_ID, PLANNING_DEEPEN_PROCEED_OPTION_ID, PLANNING_DEEPEN_PROCEED_RESPONSE_KEY, AGENT_VALID_TRANSITIONS, AGENT_PERMISSIONS, PERMANENT_AGENT_ACTION_CATEGORIES, AGENT_PERMISSION_POLICY_ACTION_CATEGORIES, AGENT_PERMISSION_POLICY_CATEGORY_TOOL_EXAMPLES, AGENT_PERMISSION_POLICY_EXEMPT_TOOL_EXAMPLES, AGENT_PROVISIONING_APPROVAL_MODES, SECRET_ACCESS_POLICIES, SANDBOX_PROVISIONING_APPROVAL_MODES, AGENT_PERMISSION_POLICY_PRESET_IDS, APPROVAL_REQUEST_STATUSES, APPROVAL_REQUEST_AUDIT_EVENT_TYPES, LEGACY_AGENT_PERMISSION_POLICY_ACTION_CATEGORY_ALIASES, DEFAULT_HEARTBEAT_PROCEDURE_PATH, DASHBOARD_USER_ID, DASHBOARD_USER_ALIASES;
 var init_types = __esm({
   "../core/src/types.ts"() {
     "use strict";
     init_capacity();
     init_mcp_config();
+    init_gitlab_config();
     init_settings_validation();
     init_settings_schema();
     init_prompt_overrides();
@@ -3200,6 +3287,10 @@ var init_types = __esm({
       done: ["todo", "triage", "archived"],
       archived: ["done"]
     };
+    PLANNING_DEEPEN_CHECKPOINT_QUESTION = "Would you like to go deeper?";
+    PLANNING_DEEPEN_CHECKPOINT_ID = "__planning_deepen_checkpoint__";
+    PLANNING_DEEPEN_PROCEED_OPTION_ID = "__planning_deepen_proceed_to_final__";
+    PLANNING_DEEPEN_PROCEED_RESPONSE_KEY = "__planning_deepen_proceed__";
     AGENT_VALID_TRANSITIONS = {
       idle: ["active"],
       active: ["idle", "running", "paused", "error"],
@@ -3272,6 +3363,12 @@ var init_types = __esm({
         "fn_delegate_task",
         "fn_task_import_github",
         "fn_task_import_github_issue",
+        "fn_task_import_gitlab_project_issues",
+        "fn_task_import_gitlab_group_issues",
+        "fn_task_import_gitlab_merge_requests",
+        "fn_task_browse_gitlab_project_issues",
+        "fn_task_browse_gitlab_group_issues",
+        "fn_task_browse_gitlab_merge_requests",
         "fn_spawn_agent",
         "fn_update_agent_config",
         "fn_task_update",
@@ -3586,6 +3683,20 @@ var init_near_duplicate_canonical = __esm({
   }
 });
 
+// ../core/src/gitlab-tracking.ts
+function formatGitLabTrackedItemRef(item) {
+  const marker = item.kind === "merge_request" ? "!" : "#";
+  return `${item.host} ${item.kind} ${marker}${item.iid}`;
+}
+function isGitLabTrackingStale(item) {
+  return Boolean(item?.staleAt || item?.staleReason);
+}
+var init_gitlab_tracking = __esm({
+  "../core/src/gitlab-tracking.ts"() {
+    "use strict";
+  }
+});
+
 // ../core/src/frontend-ux-policy.ts
 function applyFrontendUxCriteria(promptMarkdown, fileScopePaths) {
   if (promptMarkdown.includes(FRONTEND_UX_HEADING)) {
@@ -13032,7 +13143,7 @@ var init_task_title_id_drift = __esm({
 });
 
 // ../core/src/db.ts
-import { basename, isAbsolute, join as join2 } from "node:path";
+import { basename, dirname, isAbsolute, join as join2 } from "node:path";
 import { mkdirSync, existsSync, statSync, renameSync, rmSync } from "node:fs";
 import { spawn, spawnSync } from "node:child_process";
 import { createHash as createHash2, randomUUID } from "node:crypto";
@@ -13302,7 +13413,7 @@ var init_db = __esm({
     DEFAULT_SQLITE_BUSY_TIMEOUT_MS = 5e3;
     DEFAULT_SQLITE_LOCK_RECOVERY_WINDOW_MS = 1e3;
     DEFAULT_SQLITE_LOCK_RECOVERY_DELAY_MS = 50;
-    SCHEMA_VERSION = 134;
+    SCHEMA_VERSION = 136;
     TASKS_FTS_AUTOMERGE = 8;
     TASKS_FTS_CRISISMERGE = 16;
     TASKS_FTS_MERGE_PAGES = 16;
@@ -13396,6 +13507,8 @@ CREATE TABLE IF NOT EXISTS tasks (
   prInfos TEXT,
   issueInfo TEXT,
   githubTracking TEXT,
+  -- FNXC:GitLabTracking 2026-07-02-00:00: GitLab item links are a nullable JSON column so project/group issue and merge-request metadata from GitLab.com or self-managed instances round-trip without altering GitHub tracking/source-issue columns.
+  gitlabTracking TEXT,
   sourceIssueProvider TEXT,
   sourceIssueRepository TEXT,
   sourceIssueExternalIssueId TEXT,
@@ -14520,6 +14633,23 @@ CREATE INDEX IF NOT EXISTS idxIncidentsResolvedAt ON incidents(resolvedAt);
         createdAt: "TEXT NOT NULL",
         attachments: "TEXT"
       },
+      chat_token_usage: {
+        id: "TEXT PRIMARY KEY",
+        sourceKind: "TEXT NOT NULL",
+        chatSessionId: "TEXT",
+        roomId: "TEXT",
+        messageId: "TEXT",
+        projectId: "TEXT",
+        agentId: "TEXT",
+        modelProvider: "TEXT",
+        modelId: "TEXT",
+        inputTokens: "INTEGER NOT NULL DEFAULT 0",
+        outputTokens: "INTEGER NOT NULL DEFAULT 0",
+        cachedTokens: "INTEGER NOT NULL DEFAULT 0",
+        cacheWriteTokens: "INTEGER NOT NULL DEFAULT 0",
+        totalTokens: "INTEGER NOT NULL DEFAULT 0",
+        createdAt: "TEXT NOT NULL"
+      },
       runAuditEvents: {
         id: "TEXT PRIMARY KEY",
         timestamp: "TEXT NOT NULL",
@@ -14682,6 +14812,7 @@ CREATE INDEX IF NOT EXISTS idxIncidentsResolvedAt ON incidents(resolvedAt);
       static sharedIntegrityChecks = /* @__PURE__ */ new Map();
       db;
       dbPath;
+      fusionDir;
       inMemory;
       /** Returns the database file path (or ":memory:" for in-memory databases). */
       get path() {
@@ -14702,6 +14833,7 @@ CREATE INDEX IF NOT EXISTS idxIncidentsResolvedAt ON incidents(resolvedAt);
       constructor(fusionDir, options) {
         const inMemory = options?.inMemory === true;
         this.inMemory = inMemory;
+        this.fusionDir = fusionDir;
         this.dbPath = inMemory ? ":memory:" : join2(fusionDir, "fusion.db");
         this.busyTimeoutMs = Math.max(0, options?.busyTimeoutMs ?? DEFAULT_SQLITE_BUSY_TIMEOUT_MS);
         this.lockRecoveryWindowMs = Math.max(0, options?.lockRecoveryWindowMs ?? DEFAULT_SQLITE_LOCK_RECOVERY_WINDOW_MS);
@@ -17576,6 +17708,39 @@ This means a caller passed a .fusion directory where a project root was expected
             this.addColumnIfMissing("workflows", "icon", "TEXT");
           });
         }
+        if (version2 < 135) {
+          this.applyMigration(135, () => {
+            this.addColumnIfMissing("tasks", "gitlabTracking", "TEXT");
+          });
+        }
+        if (version2 < 136) {
+          this.applyMigration(136, () => {
+            this.db.exec(`
+          CREATE TABLE IF NOT EXISTS chat_token_usage (
+            id TEXT PRIMARY KEY,
+            sourceKind TEXT NOT NULL,
+            chatSessionId TEXT,
+            roomId TEXT,
+            messageId TEXT,
+            projectId TEXT,
+            agentId TEXT,
+            modelProvider TEXT,
+            modelId TEXT,
+            inputTokens INTEGER NOT NULL DEFAULT 0,
+            outputTokens INTEGER NOT NULL DEFAULT 0,
+            cachedTokens INTEGER NOT NULL DEFAULT 0,
+            cacheWriteTokens INTEGER NOT NULL DEFAULT 0,
+            totalTokens INTEGER NOT NULL DEFAULT 0,
+            createdAt TEXT NOT NULL
+          );
+          CREATE INDEX IF NOT EXISTS idxChatTokenUsageCreatedAt ON chat_token_usage(createdAt);
+          CREATE INDEX IF NOT EXISTS idxChatTokenUsageProjectCreatedAt ON chat_token_usage(projectId, createdAt);
+          CREATE INDEX IF NOT EXISTS idxChatTokenUsageSessionMessage ON chat_token_usage(chatSessionId, messageId);
+          CREATE INDEX IF NOT EXISTS idxChatTokenUsageRoomMessage ON chat_token_usage(roomId, messageId);
+          CREATE INDEX IF NOT EXISTS idxChatTokenUsageAgentCreatedAt ON chat_token_usage(agentId, createdAt);
+        `);
+          });
+        }
       }
       /**
        * Idempotent schema reconciliation for the PR-entity tables. ensureSchema-
@@ -17950,23 +18115,61 @@ This means a caller passed a .fusion directory where a project root was expected
         const value = this.getMetaValue(_Database.PROJECT_IDENTITY_META_KEY);
         return fromJson(value);
       }
+      parseWorkflowSettingsJson(raw) {
+        if (!raw) return {};
+        try {
+          const parsed = JSON.parse(raw);
+          return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
+        } catch {
+          return {};
+        }
+      }
+      reconcileWorkflowSettingsRootDirProjectId(identityId) {
+        if (this.inMemory) return false;
+        const rootDirProjectId = basename(this.fusionDir) === ".fusion" ? dirname(this.fusionDir) : this.fusionDir;
+        if (!rootDirProjectId || rootDirProjectId === identityId) return false;
+        const rows = this.db.prepare('SELECT workflowId, "values" FROM workflow_settings WHERE projectId = ?').all(rootDirProjectId);
+        if (rows.length === 0) return false;
+        let changed = false;
+        const now = (/* @__PURE__ */ new Date()).toISOString();
+        for (const row of rows) {
+          const rootValues = this.parseWorkflowSettingsJson(row.values);
+          if (Object.keys(rootValues).length === 0) continue;
+          const identityRow = this.db.prepare('SELECT "values" FROM workflow_settings WHERE workflowId = ? AND projectId = ?').get(row.workflowId, identityId);
+          const identityValues = this.parseWorkflowSettingsJson(identityRow?.values);
+          const carriesEveryRootKey = Object.keys(rootValues).every((key) => Object.prototype.hasOwnProperty.call(identityValues, key));
+          if (carriesEveryRootKey) continue;
+          const next = { ...rootValues, ...identityValues };
+          this.db.prepare(
+            `INSERT INTO workflow_settings (workflowId, projectId, "values", updatedAt)
+           VALUES (?, ?, ?, ?)
+           ON CONFLICT(workflowId, projectId)
+           DO UPDATE SET "values" = excluded."values", updatedAt = excluded.updatedAt`
+          ).run(row.workflowId, identityId, JSON.stringify(next), now);
+          changed = true;
+        }
+        return changed;
+      }
       setProjectIdentity(identity, options) {
         const stored = this.getProjectIdentity();
         const force = options?.force === true;
-        if (stored) {
-          if (stored.id === identity.id) {
-            return;
-          }
-          if (!force) {
-            throw new ProjectIdentityConflictError({
-              storedId: stored.id,
-              storedPath: stored.firstSeenPath,
-              incomingId: identity.id,
-              incomingPath: identity.firstSeenPath
-            });
-          }
+        if (stored && stored.id !== identity.id && !force) {
+          throw new ProjectIdentityConflictError({
+            storedId: stored.id,
+            storedPath: stored.firstSeenPath,
+            incomingId: identity.id,
+            incomingPath: identity.firstSeenPath
+          });
         }
-        this.setMetaValue(_Database.PROJECT_IDENTITY_META_KEY, JSON.stringify(identity));
+        this.transactionImmediate(() => {
+          let changed = false;
+          if (!stored || stored.id !== identity.id || force) {
+            this.setMetaValue(_Database.PROJECT_IDENTITY_META_KEY, JSON.stringify(identity));
+            changed = true;
+          }
+          changed = this.reconcileWorkflowSettingsRootDirProjectId(identity.id) || changed;
+          if (changed) this.bumpLastModified();
+        });
       }
       clearProjectIdentity() {
         this.db.prepare("DELETE FROM __meta WHERE key = ?").run(_Database.PROJECT_IDENTITY_META_KEY);
@@ -18022,7 +18225,7 @@ This means a caller passed a .fusion directory where a project root was expected
 // ../core/src/agent-store.ts
 import { mkdir, readFile, writeFile, readdir, unlink, rename, access, appendFile } from "node:fs/promises";
 import { constants as fsConstants } from "node:fs";
-import { basename as basename2, dirname, join as join3, resolve as resolve2 } from "node:path";
+import { basename as basename2, dirname as dirname2, join as join3, resolve as resolve2 } from "node:path";
 import { randomUUID as randomUUID2, randomBytes, createHash as createHash3 } from "node:crypto";
 import { EventEmitter } from "node:events";
 function formatCurrentTaskLine(taskId, linkedTask) {
@@ -18034,6 +18237,12 @@ function formatCurrentTaskLine(taskId, linkedTask) {
   }
   return `Current Task: ${taskId} (${linkedTask.column})`;
 }
+function normalizeStoredPermissions(raw) {
+  if (!raw) return void 0;
+  const normalized = normalizePermissions(raw);
+  if (normalized.size === 0) return void 0;
+  return Object.fromEntries([...normalized].map((permission) => [permission, true]));
+}
 function resolveCreationRuntimeConfig(incoming, metadata) {
   const isEphemeral = isEphemeralAgent({ metadata });
   if (isEphemeral) {
@@ -18159,7 +18368,7 @@ var init_agent_store = __esm({
           const newAbsPath = join3(this.rootDir, "..", newRelPath);
           if (legacyContent !== null) {
             try {
-              await mkdir(dirname(newAbsPath), { recursive: true });
+              await mkdir(dirname2(newAbsPath), { recursive: true });
               try {
                 await access(newAbsPath, fsConstants.F_OK);
               } catch {
@@ -18391,7 +18600,7 @@ var init_agent_store = __esm({
         const agentId = `agent-${randomUUID2().slice(0, 8)}`;
         const runtimeConfig = resolveCreationRuntimeConfig(input.runtimeConfig, metadata);
         const resolvedHeartbeatProcedurePath = input.heartbeatProcedurePath ?? (ephemeral ? void 0 : getDefaultHeartbeatProcedurePath(agentId, input.name));
-        const normalizedPermissionPolicy = ephemeral ? input.permissionPolicy : resolveEffectiveAgentPermissionPolicy(input.permissionPolicy);
+        const normalizedPermissionPolicy = input.permissionPolicy ? normalizeAgentPermissionPolicy(input.permissionPolicy) : void 0;
         const agent = {
           id: agentId,
           name: normalizedName,
@@ -18408,7 +18617,7 @@ var init_agent_store = __esm({
           ...input.imageUrl && { imageUrl: input.imageUrl },
           ...input.reportsTo && { reportsTo: input.reportsTo },
           ...runtimeConfig && { runtimeConfig },
-          ...input.permissions && { permissions: input.permissions },
+          ...normalizeStoredPermissions(input.permissions) && { permissions: normalizeStoredPermissions(input.permissions) },
           ...normalizedPermissionPolicy && { permissionPolicy: normalizedPermissionPolicy },
           ...input.instructionsPath && { instructionsPath: input.instructionsPath },
           ...input.instructionsText && { instructionsText: input.instructionsText },
@@ -18795,7 +19004,7 @@ var init_agent_store = __esm({
             ..."reportsTo" in updates && { reportsTo: updates.reportsTo },
             ..."runtimeConfig" in updates && { runtimeConfig: updates.runtimeConfig },
             ..."pauseReason" in updates && { pauseReason: updates.pauseReason },
-            ..."permissions" in updates && { permissions: updates.permissions },
+            ..."permissions" in updates && { permissions: normalizeStoredPermissions(updates.permissions) },
             ..."permissionPolicy" in updates && { permissionPolicy: normalizedUpdatedPermissionPolicy },
             ..."lastError" in updates && { lastError: updates.lastError },
             ..."totalInputTokens" in updates && { totalInputTokens: updates.totalInputTokens },
@@ -20191,8 +20400,8 @@ var init_agent_store = __esm({
           reportsTo: data.reportsTo,
           runtimeConfig: data.runtimeConfig,
           pauseReason: data.pauseReason,
-          permissions: data.permissions,
-          permissionPolicy: isEphemeralAgent(data) ? data.permissionPolicy : resolveEffectiveAgentPermissionPolicy(data.permissionPolicy),
+          permissions: normalizeStoredPermissions(data.permissions),
+          permissionPolicy: data.permissionPolicy ? normalizeAgentPermissionPolicy(data.permissionPolicy) : void 0,
           totalInputTokens: data.totalInputTokens,
           totalOutputTokens: data.totalOutputTokens,
           lastError: data.lastError,
@@ -21809,7 +22018,7 @@ var init_task_priority = __esm({
 
 // ../core/src/global-settings.ts
 import { homedir } from "node:os";
-import { basename as basename3, dirname as dirname2, join as join5, resolve as resolve4 } from "node:path";
+import { basename as basename3, dirname as dirname3, join as join5, resolve as resolve4 } from "node:path";
 import { mkdir as mkdir3, readFile as readFile3, writeFile as writeFile3, rename as rename2, chmod } from "node:fs/promises";
 import { existsSync as existsSync3, mkdirSync as mkdirSync2, realpathSync as realpathSync2, renameSync as renameSync2 } from "node:fs";
 function getHomeDir() {
@@ -21823,7 +22032,7 @@ function resolveGlobalDirForHome(homeDir) {
   const legacyDir = join5(homeDir, ".pi", "fusion");
   if (existsSync3(legacyDir)) {
     try {
-      mkdirSync2(dirname2(preferredDir), { recursive: true });
+      mkdirSync2(dirname3(preferredDir), { recursive: true });
       renameSync2(legacyDir, preferredDir);
       return preferredDir;
     } catch {
@@ -21833,7 +22042,7 @@ function resolveGlobalDirForHome(homeDir) {
   const legacyDirOriginal = join5(homeDir, ".pi", "kb");
   if (existsSync3(legacyDirOriginal)) {
     try {
-      mkdirSync2(dirname2(preferredDir), { recursive: true });
+      mkdirSync2(dirname3(preferredDir), { recursive: true });
       renameSync2(legacyDirOriginal, preferredDir);
       return preferredDir;
     } catch {
@@ -21851,7 +22060,7 @@ function resolveGlobalDir(dir) {
   }
   if (hasExplicitDir) {
     if (process.env.VITEST !== "true" && process.env.FUSION_ALLOW_PROJECT_LOCAL_GLOBAL_DIR !== "true") {
-      const isFusionDirInsideRepo = basename3(dir) === ".fusion" && existsSync3(join5(dirname2(dir), ".git"));
+      const isFusionDirInsideRepo = basename3(dir) === ".fusion" && existsSync3(join5(dirname3(dir), ".git"));
       if (isFusionDirInsideRepo) {
         const homeGlobalDir = resolveGlobalDirForHome(getHomeDir());
         const normalize8 = (p2) => {
@@ -27801,7 +28010,7 @@ var init_plugin_types = __esm({
 // ../core/src/project-root-guard.ts
 import { spawnSync as spawnSync2 } from "node:child_process";
 import { existsSync as existsSync7 } from "node:fs";
-import { dirname as dirname3, join as join9, resolve as resolve5 } from "node:path";
+import { dirname as dirname4, join as join9, resolve as resolve5 } from "node:path";
 function assertProjectRootDir(rootDir, caller) {
   if (FUSION_DIR_SUFFIX.test(rootDir)) {
     throw new Error(
@@ -27837,7 +28046,7 @@ function assertNotLinkedWorktreeOfExistingProject(rootDir, _caller) {
   if (resolvedCommonDir === resolvedGitDir) {
     return;
   }
-  const parentRoot = resolvedCommonDir.endsWith(`${join9("", ".git")}`) ? dirname3(resolvedCommonDir) : resolvedCommonDir;
+  const parentRoot = resolvedCommonDir.endsWith(`${join9("", ".git")}`) ? dirname4(resolvedCommonDir) : resolvedCommonDir;
   if (!existsSync7(join9(parentRoot, ".fusion", "fusion.db"))) {
     return;
   }
@@ -30823,11 +31032,11 @@ var init_eval_store = __esm({
 
 // ../core/src/app-version.ts
 import { readFileSync } from "node:fs";
-import { join as join11, dirname as dirname4 } from "node:path";
+import { join as join11, dirname as dirname5 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 function getAppVersion() {
   if (cachedVersion !== null) return cachedVersion;
-  const __dirname2 = dirname4(fileURLToPath2(import.meta.url));
+  const __dirname2 = dirname5(fileURLToPath2(import.meta.url));
   let currentDir = __dirname2;
   for (let i = 0; i < 10; i++) {
     try {
@@ -30839,7 +31048,7 @@ function getAppVersion() {
       }
     } catch {
     }
-    const parentDir = dirname4(currentDir);
+    const parentDir = dirname5(currentDir);
     if (parentDir === currentDir) break;
     currentDir = parentDir;
   }
@@ -37566,7 +37775,7 @@ __export(migration_exports, {
 });
 import { existsSync as existsSync11, readFileSync as readFileSync2, realpathSync as realpathSync3 } from "node:fs";
 import { homedir as homedir2, tmpdir } from "node:os";
-import { isAbsolute as isAbsolute3, join as join14, resolve as resolve8, basename as basename6, dirname as dirname5 } from "node:path";
+import { isAbsolute as isAbsolute3, join as join14, resolve as resolve8, basename as basename6, dirname as dirname6 } from "node:path";
 function getHomeDir2() {
   return process.env.HOME || process.env.USERPROFILE || homedir2();
 }
@@ -37667,7 +37876,7 @@ var init_migration = __esm({
         const visited = /* @__PURE__ */ new Set();
         let current = resolve8(startDir);
         const home = resolve8(getHomeDir2());
-        const root = dirname5(current) === current ? current : "/";
+        const root = dirname6(current) === current ? current : "/";
         const systemTmp = resolve8(tmpdir());
         const normalizePath4 = (path6) => {
           try {
@@ -37704,7 +37913,7 @@ var init_migration = __esm({
           if (isStopBoundary) {
             break;
           }
-          const parent = dirname5(current);
+          const parent = dirname6(current);
           if (parent === current) break;
           current = parent;
         }
@@ -48807,7 +49016,7 @@ var init_memory_dreams = __esm({
 // ../core/src/memory-backend.ts
 import { readFile as readFile6, writeFile as writeFile5, mkdir as mkdir6, access as access3, constants, readdir as readdir4, stat as stat2 } from "node:fs/promises";
 import { existsSync as existsSync13 } from "node:fs";
-import { basename as basename7, dirname as dirname6, isAbsolute as isAbsolute4, join as join18, normalize as normalize3, relative, resolve as resolve9, sep as sep3 } from "node:path";
+import { basename as basename7, dirname as dirname7, isAbsolute as isAbsolute4, join as join18, normalize as normalize3, relative, resolve as resolve9, sep as sep3 } from "node:path";
 import { createHash as createHash7 } from "node:crypto";
 function shouldSkipBackgroundQmdRefresh() {
   return (process.env.VITEST === "true" || process.env.NODE_ENV === "test") && process.env.FUSION_ENABLE_QMD_REFRESH_IN_TESTS !== "1";
@@ -48973,7 +49182,7 @@ async function readProjectMemoryFileContent(rootDir, path6) {
 }
 async function writeProjectMemoryFile(rootDir, path6, content) {
   const { absPath } = resolveMemoryFilePath(rootDir, path6);
-  await mkdir6(dirname6(absPath), { recursive: true });
+  await mkdir6(dirname7(absPath), { recursive: true });
   const tmpPath = `${absPath}.tmp`;
   await writeFile5(tmpPath, content, "utf-8");
   const { rename: rename9 } = await import("node:fs/promises");
@@ -49092,7 +49301,7 @@ async function readAgentMemoryFile(rootDir, agentId, path6) {
 }
 async function writeAgentMemoryFile(rootDir, agentId, path6, content) {
   const { absPath } = await resolveAgentMemoryFilePath(rootDir, agentId, path6);
-  await mkdir6(dirname6(absPath), { recursive: true });
+  await mkdir6(dirname7(absPath), { recursive: true });
   const tmpPath = `${absPath}.tmp`;
   await writeFile5(tmpPath, content, "utf-8");
   const { rename: rename9 } = await import("node:fs/promises");
@@ -49238,7 +49447,7 @@ function normalizeQmdSearchResultPath(rootDir, rawPath) {
   }
   const lowerCandidate = candidate.toLowerCase();
   const normalizedBaseName = basename7(candidate).toLowerCase();
-  const normalizedDirName = dirname6(lowerCandidate).replace(/\\/g, "/");
+  const normalizedDirName = dirname7(lowerCandidate).replace(/\\/g, "/");
   if (normalizedBaseName === "memory.md" && (normalizedDirName === ".fusion" || normalizedDirName.endsWith("/.fusion"))) {
     return `${MEMORY_WORKSPACE_PATH}/${MEMORY_LONG_TERM_FILENAME}`;
   }
@@ -50387,14 +50596,14 @@ var init_agent_log_constants = __esm({
 
 // ../core/src/agent-log-file-store.ts
 import { appendFileSync, existsSync as existsSync15, mkdirSync as mkdirSync6, readFileSync as readFileSync3, readdirSync, renameSync as renameSync3, unlinkSync, writeFileSync } from "node:fs";
-import { dirname as dirname7, join as join19 } from "node:path";
+import { dirname as dirname8, join as join19 } from "node:path";
 function getAgentLogFilePath(taskDir) {
   return join19(taskDir, AGENT_LOG_FILENAME);
 }
 function appendAgentLogEntriesSync(taskDir, entries) {
   if (entries.length === 0) return [];
   const filePath = getAgentLogFilePath(taskDir);
-  mkdirSync6(dirname7(filePath), { recursive: true });
+  mkdirSync6(dirname8(filePath), { recursive: true });
   const startingLineNo = countLineNumbers(filePath);
   const payload = entries.map((entry) => serializeEntry(entry)).join("");
   appendFileSync(filePath, payload, "utf8");
@@ -51831,6 +52040,7 @@ var init_store = __esm({
       defineTaskColumn("prInfos", (task) => toJson(task.prInfos || [])),
       defineTaskColumn("issueInfo", (task) => toJsonNullable(task.issueInfo)),
       defineTaskColumn("githubTracking", (task) => toJsonNullable(task.githubTracking)),
+      defineTaskColumn("gitlabTracking", (task) => toJsonNullable(task.gitlabTracking)),
       defineTaskColumn("sourceIssueProvider", (task) => task.sourceIssue?.provider ?? null),
       defineTaskColumn("sourceIssueRepository", (task) => task.sourceIssue?.repository ?? null),
       defineTaskColumn("sourceIssueExternalIssueId", (task) => task.sourceIssue?.externalIssueId ?? null),
@@ -52624,6 +52834,7 @@ var init_store = __esm({
           })(),
           issueInfo: fromJson(row.issueInfo),
           githubTracking: fromJson(row.githubTracking) ?? void 0,
+          gitlabTracking: fromJson(row.gitlabTracking) ?? void 0,
           sourceIssue: (() => {
             if (row.sourceIssueProvider === null || row.sourceIssueRepository === null || row.sourceIssueExternalIssueId === null || row.sourceIssueNumber === null) {
               return void 0;
@@ -52733,6 +52944,7 @@ var init_store = __esm({
           prInfos: slim ? void 0 : entry.prInfos,
           issueInfo: slim ? void 0 : entry.issueInfo,
           githubTracking: entry.githubTracking,
+          gitlabTracking: entry.gitlabTracking,
           sourceIssue: slim ? void 0 : entry.sourceIssue,
           attachments: slim ? void 0 : entry.attachments,
           comments: entry.comments,
@@ -52846,6 +53058,7 @@ ${recentText}` : void 0
           prInfos: task.prInfos,
           issueInfo: task.issueInfo,
           githubTracking: task.githubTracking,
+          gitlabTracking: task.gitlabTracking,
           sourceIssue: task.sourceIssue,
           attachments: task.attachments,
           comments: task.comments,
@@ -53123,6 +53336,7 @@ ${recentText}` : void 0
           "prInfos",
           "issueInfo",
           "githubTracking",
+          "gitlabTracking",
           "sourceIssueProvider",
           "sourceIssueRepository",
           "sourceIssueExternalIssueId",
@@ -53319,6 +53533,7 @@ ${outcome}`;
           "prInfos",
           "issueInfo",
           "githubTracking",
+          "gitlabTracking",
           "sourceIssueProvider",
           "sourceIssueRepository",
           "sourceIssueExternalIssueId",
@@ -55096,6 +55311,7 @@ ${TASK_UPSERT_SQL_ASSIGNMENTS}
           tokenUsage: input.tokenUsage,
           sourceIssue: input.sourceIssue,
           githubTracking: input.githubTracking,
+          gitlabTracking: input.gitlabTracking,
           sourceType: input.source?.sourceType ?? "unknown",
           sourceAgentId: input.source?.sourceAgentId,
           sourceRunId: input.source?.sourceRunId,
@@ -56146,17 +56362,23 @@ ${newTask.description}
         }
       }
       async listTasksForGithubTrackingReconcile(options) {
+        return this.listTasksForProviderTrackingReconcile("githubTracking", options);
+      }
+      async listTasksForGitlabTrackingReconcile(options) {
+        return this.listTasksForProviderTrackingReconcile("gitlabTracking", options);
+      }
+      listTasksForProviderTrackingReconcile(trackingColumn, options) {
         const reconcileScanLimit = 200;
         const offset = Math.max(0, options?.offset ?? 0);
         const limit = Math.max(0, options?.limit ?? reconcileScanLimit);
         const selectClause = this.getTaskSelectClause(true);
         const deletedTotal = this.db.prepare(
-          'SELECT COUNT(*) as count FROM tasks WHERE "deletedAt" IS NOT NULL AND "githubTracking" IS NOT NULL'
+          `SELECT COUNT(*) as count FROM tasks WHERE "deletedAt" IS NOT NULL AND "${trackingColumn}" IS NOT NULL`
         ).get();
         const deletedCount = Number(deletedTotal?.count ?? 0);
         const deletedOffset = Math.min(offset, deletedCount);
         const deletedRows = this.db.prepare(
-          `SELECT ${selectClause} FROM tasks WHERE "deletedAt" IS NOT NULL AND "githubTracking" IS NOT NULL ORDER BY updatedAt ASC LIMIT ? OFFSET ?`
+          `SELECT ${selectClause} FROM tasks WHERE "deletedAt" IS NOT NULL AND "${trackingColumn}" IS NOT NULL ORDER BY updatedAt ASC LIMIT ? OFFSET ?`
         ).all(limit, deletedOffset);
         const deletedTasks = deletedRows.map((row) => {
           const task = this.rowToTask(row);
@@ -56167,7 +56389,7 @@ ${newTask.description}
         let archivedTasks = [];
         let archivedCount = 0;
         try {
-          const archivedCandidates = this.archiveDb.list().map((entry) => this.archiveEntryToTask(entry, true)).filter((task) => Boolean(task.githubTracking));
+          const archivedCandidates = this.archiveDb.list().map((entry) => this.archiveEntryToTask(entry, true)).filter((task) => Boolean(task[trackingColumn]));
           archivedCount = archivedCandidates.length;
           const archivedOffset = Math.max(0, offset - deletedCount);
           const remainingLimit = Math.max(0, limit - deletedTasks.length);
@@ -58456,6 +58678,38 @@ ${newTask.description}
             }
             task.githubTracking = nextTracking;
           }
+          if (updates.gitlabTracking === null) {
+            task.gitlabTracking = void 0;
+          } else if (updates.gitlabTracking !== void 0) {
+            const previousTracking = task.gitlabTracking;
+            const previousItem = previousTracking?.item;
+            const { item: gitlabItemPatch, ...gitlabTrackingPatch } = updates.gitlabTracking;
+            const nextTracking = {
+              ...previousTracking ?? {},
+              ...gitlabTrackingPatch
+            };
+            if (gitlabItemPatch === null) {
+              if (previousItem) {
+                task.log.push({
+                  timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+                  action: "GitLab item unlinked",
+                  outcome: `${previousItem.host} ${previousItem.kind} !${previousItem.iid}`,
+                  ...runContext ? { runContext } : {}
+                });
+              }
+              nextTracking.item = void 0;
+              nextTracking.unlinkedAt = (/* @__PURE__ */ new Date()).toISOString();
+            } else if (gitlabItemPatch !== void 0) {
+              nextTracking.item = gitlabItemPatch;
+              task.log.push({
+                timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+                action: "GitLab item linked",
+                outcome: `${gitlabItemPatch.host} ${gitlabItemPatch.kind} !${gitlabItemPatch.iid}`,
+                ...runContext ? { runContext } : {}
+              });
+            }
+            task.gitlabTracking = nextTracking;
+          }
           if (updates.tokenUsage === null) {
             task.tokenUsage = void 0;
           } else if (updates.tokenUsage !== void 0) {
@@ -60191,9 +60445,15 @@ ${newTask.description}
             throw new TaskSelfDeleteError(id);
           }
           this.flushAgentLogBuffer();
-          const task = this.readTaskFromDb(id, { includeDeleted: true });
+          let task = this.readTaskFromDb(id, { includeDeleted: true });
+          let restoredColdArchive = false;
           if (!task) {
-            throw new Error(`Task ${id} not found`);
+            const archivedEntry = await this.findInArchive(id);
+            if (!archivedEntry) {
+              throw new Error(`Task ${id} not found`);
+            }
+            task = await this.restoreFromArchive(archivedEntry);
+            restoredColdArchive = true;
           }
           if (task.deletedAt) {
             return task;
@@ -60221,9 +60481,15 @@ ${newTask.description}
             rewrittenDependents = this.rewriteDependentsForRemoval(id, dependentIds);
             rewrittenBlockedByResidueDependents = this.rewriteBlockedByResidueDependentsForRemoval(id, new Set(dependentIds));
             rewrittenLineageChildren = this.rewriteLineageChildrenForRemoval(id, lineageChildIds);
+            if (restoredColdArchive) {
+              this.upsertTaskWithFtsRecovery(task);
+            }
             const deletedAt = (/* @__PURE__ */ new Date()).toISOString();
             const allowResurrection = options?.allowResurrection === true ? 1 : 0;
             this.db.prepare(`UPDATE tasks SET "column" = 'archived', deletedAt = ?, allowResurrection = ?, updatedAt = ? WHERE id = ?`).run(deletedAt, allowResurrection, deletedAt, id);
+            task.deletedAt = deletedAt;
+            task.allowResurrection = options?.allowResurrection === true ? true : void 0;
+            task.updatedAt = deletedAt;
             this.recordRunAuditEvent({
               domain: "database",
               mutationType: "task:deleted",
@@ -60247,6 +60513,7 @@ ${newTask.description}
           if (this.agentLogBuffer.length > 0) {
             this.agentLogBuffer = this.agentLogBuffer.filter((entry) => entry.taskId !== id);
           }
+          this.archiveDb.delete(id);
           if (this.isWatching) this.taskCache.delete(id);
           for (const dependentTask of rewrittenDependents) {
             this.emit("task:updated", dependentTask);
@@ -62316,6 +62583,76 @@ ${newTask.description}
           return task;
         });
       }
+      async updateGitLabTracking(id, tracking) {
+        return this.withTaskLock(id, async () => {
+          const dir = this.taskDir(id);
+          const task = await this.readTaskJson(dir);
+          const nextTracking = tracking ?? void 0;
+          const previousTracking = task.gitlabTracking;
+          if (JSON.stringify(previousTracking ?? null) === JSON.stringify(nextTracking ?? null)) {
+            return task;
+          }
+          task.gitlabTracking = nextTracking;
+          task.log.push({
+            timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+            action: nextTracking?.item ? "GitLab item linked" : "GitLab tracking cleared",
+            outcome: nextTracking?.item ? `${nextTracking.item.host} ${nextTracking.item.kind} !${nextTracking.item.iid}` : void 0
+          });
+          task.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+          await this.atomicWriteTaskJson(dir, task);
+          if (this.isWatching) this.taskCache.set(id, { ...task });
+          this.emit("task:updated", task);
+          return task;
+        });
+      }
+      async linkGitLabItem(id, item) {
+        return this.withTaskLock(id, async () => {
+          const dir = this.taskDir(id);
+          const task = await this.readTaskJson(dir);
+          const previous = task.gitlabTracking ?? {};
+          const nextTracking = { ...previous, item };
+          if (JSON.stringify(previous) === JSON.stringify(nextTracking)) {
+            return task;
+          }
+          task.gitlabTracking = nextTracking;
+          task.log.push({
+            timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+            action: "GitLab item linked",
+            outcome: `${item.host} ${item.kind} !${item.iid}`
+          });
+          task.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+          await this.atomicWriteTaskJson(dir, task);
+          if (this.isWatching) this.taskCache.set(id, { ...task });
+          this.emit("task:updated", task);
+          return task;
+        });
+      }
+      async unlinkGitLabItem(id) {
+        return this.withTaskLock(id, async () => {
+          const dir = this.taskDir(id);
+          const task = await this.readTaskJson(dir);
+          const previous = task.gitlabTracking;
+          const previousItem = previous?.item;
+          if (!previousItem || !previous) {
+            return task;
+          }
+          task.gitlabTracking = {
+            ...previous,
+            item: void 0,
+            unlinkedAt: (/* @__PURE__ */ new Date()).toISOString()
+          };
+          task.log.push({
+            timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+            action: "GitLab item unlinked",
+            outcome: `${previousItem.host} ${previousItem.kind} !${previousItem.iid}`
+          });
+          task.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+          await this.atomicWriteTaskJson(dir, task);
+          if (this.isWatching) this.taskCache.set(id, { ...task });
+          this.emit("task:updated", task);
+          return task;
+        });
+      }
       /**
        * Read historical agent log entries for a task from JSONL storage.
        * Returns entries in chronological order (oldest first).
@@ -62801,6 +63138,7 @@ ${newTask.description}
           review: entry.review,
           issueInfo: entry.issueInfo,
           githubTracking: entry.githubTracking,
+          gitlabTracking: entry.gitlabTracking,
           sourceIssue: entry.sourceIssue,
           attachments: entry.attachments,
           log: [...entry.log, { timestamp: (/* @__PURE__ */ new Date()).toISOString(), action: "Task restored from archive" }],
@@ -65495,19 +65833,20 @@ function emptyTotals() {
     cachedTokens: 0,
     cacheWriteTokens: 0,
     totalTokens: 0,
-    nTasks: 0
+    nTasks: 0,
+    nChatMessages: 0
   };
 }
 function groupKeyFor(row, groupBy) {
   switch (groupBy) {
     case "model":
-      return row.tokenUsageModelId ?? row.modelId;
+      return row.contributionKind === "task" ? row.tokenUsageModelId ?? row.modelId : row.modelId;
     case "provider":
-      return row.tokenUsageModelProvider ?? row.modelProvider;
+      return row.contributionKind === "task" ? row.tokenUsageModelProvider ?? row.modelProvider : row.modelProvider;
     case "node":
-      return row.checkoutNodeId;
+      return row.contributionKind === "task" ? row.checkoutNodeId : null;
     case "agent":
-      return row.assignedAgentId;
+      return row.contributionKind === "task" ? row.assignedAgentId : row.agentId;
   }
 }
 function emptyCostAccumulator() {
@@ -65522,8 +65861,8 @@ function addRowCost(acc, row, now, pricingOverrides) {
       cacheWriteTokens: row.cacheWriteTokens ?? 0
     },
     {
-      provider: row.tokenUsageModelProvider ?? row.modelProvider,
-      model: row.tokenUsageModelId ?? row.modelId
+      provider: row.contributionKind === "task" ? row.tokenUsageModelProvider ?? row.modelProvider : row.modelProvider,
+      model: row.contributionKind === "task" ? row.tokenUsageModelId ?? row.modelId : row.modelId
     },
     now,
     pricingOverrides
@@ -65544,11 +65883,11 @@ function finalizeCost(acc) {
   };
 }
 function parsePerModelRows(row) {
-  if (!row.tokenUsagePerModel) return [];
+  if (!row.tokenUsagePerModel) return { valid: false, rows: [] };
   try {
     const parsed = JSON.parse(row.tokenUsagePerModel);
-    if (!Array.isArray(parsed) || parsed.length === 0) return [];
-    return parsed.filter((entry) => entry !== null && typeof entry === "object").map((entry) => {
+    if (!Array.isArray(parsed) || parsed.length === 0) return { valid: false, rows: [] };
+    const rows = parsed.filter((entry) => entry !== null && typeof entry === "object").map((entry) => {
       const inputTokens = Number.isFinite(entry.inputTokens) ? Number(entry.inputTokens) : 0;
       const outputTokens = Number.isFinite(entry.outputTokens) ? Number(entry.outputTokens) : 0;
       const cachedTokens = Number.isFinite(entry.cachedTokens) ? Number(entry.cachedTokens) : 0;
@@ -65562,21 +65901,34 @@ function parsePerModelRows(row) {
         cacheWriteTokens,
         totalTokens,
         tokenUsageModelProvider: typeof entry.modelProvider === "string" ? entry.modelProvider : null,
-        tokenUsageModelId: typeof entry.modelId === "string" ? entry.modelId : null
+        tokenUsageModelId: typeof entry.modelId === "string" ? entry.modelId : null,
+        tokenUsageLastUsedAt: typeof entry.lastUsedAt === "string" ? entry.lastUsedAt : row.tokenUsageLastUsedAt,
+        contributionKind: "task"
       };
     });
+    return { valid: rows.length > 0, rows };
   } catch {
-    return [];
+    return { valid: false, rows: [] };
   }
 }
-function addRow(totals, row) {
+function isWithinRange(isoTimestamp, from, to2) {
+  return (from === void 0 || isoTimestamp >= from) && (to2 === void 0 || isoTimestamp <= to2);
+}
+function addRow(totals, row, ids) {
   totals.inputTokens += row.inputTokens ?? 0;
   totals.outputTokens += row.outputTokens ?? 0;
   totals.cachedTokens += row.cachedTokens ?? 0;
   totals.cacheWriteTokens += row.cacheWriteTokens ?? 0;
   const persistedTotal = row.totalTokens;
   totals.totalTokens += persistedTotal ?? (row.inputTokens ?? 0) + (row.outputTokens ?? 0) + (row.cachedTokens ?? 0) + (row.cacheWriteTokens ?? 0);
-  totals.nTasks += 1;
+  if (!ids || !ids.has(row.id)) {
+    if (row.contributionKind === "task") {
+      totals.nTasks += 1;
+    } else {
+      totals.nChatMessages = (totals.nChatMessages ?? 0) + 1;
+    }
+    ids?.add(row.id);
+  }
 }
 function isoWeekBucket(isoTimestamp) {
   const date5 = new Date(isoTimestamp);
@@ -65587,30 +65939,39 @@ function isoWeekBucket(isoTimestamp) {
   const week = Math.ceil(((thursday.getTime() - yearStart.getTime()) / 864e5 + 1) / 7);
   return `${thursday.getUTCFullYear()}-W${String(week).padStart(2, "0")}`;
 }
+function contributionTimestamp(row) {
+  return row.contributionKind === "task" ? row.tokenUsageLastUsedAt : row.createdAt;
+}
 function bucketFor(row, granularity) {
+  const timestamp = contributionTimestamp(row);
   switch (granularity) {
     case "hour":
-      return row.tokenUsageLastUsedAt.slice(0, 13);
+      return timestamp.slice(0, 13);
     case "day":
-      return row.tokenUsageLastUsedAt.slice(0, 10);
+      return timestamp.slice(0, 10);
     case "week":
-      return isoWeekBucket(row.tokenUsageLastUsedAt);
+      return isoWeekBucket(timestamp);
   }
 }
 function aggregateTokenAnalytics(db, query = {}) {
   const clauses = ["tokenUsageLastUsedAt IS NOT NULL"];
   const params = [];
+  const rangeClauses2 = [];
   if (query.from !== void 0) {
-    clauses.push("tokenUsageLastUsedAt >= ?");
+    rangeClauses2.push("tokenUsageLastUsedAt >= ?");
     params.push(query.from);
   }
   if (query.to !== void 0) {
-    clauses.push("tokenUsageLastUsedAt <= ?");
+    rangeClauses2.push("tokenUsageLastUsedAt <= ?");
     params.push(query.to);
   }
+  if (rangeClauses2.length > 0) {
+    clauses.push(`((${rangeClauses2.join(" AND ")}) OR tokenUsagePerModel IS NOT NULL)`);
+  }
   const where = `WHERE ${clauses.join(" AND ")}`;
   const rows = db.prepare(
     `SELECT
+         id,
          tokenUsageInputTokens   AS inputTokens,
          tokenUsageOutputTokens  AS outputTokens,
          tokenUsageCachedTokens  AS cachedTokens,
@@ -65626,6 +65987,36 @@ function aggregateTokenAnalytics(db, query = {}) {
          tokenUsageLastUsedAt
        FROM tasks ${where}`
   ).all(...params);
+  const chatClauses = [];
+  const chatParams = [];
+  if (query.from !== void 0) {
+    chatClauses.push("createdAt >= ?");
+    chatParams.push(query.from);
+  }
+  if (query.to !== void 0) {
+    chatClauses.push("createdAt <= ?");
+    chatParams.push(query.to);
+  }
+  const chatWhere = chatClauses.length > 0 ? `WHERE ${chatClauses.join(" AND ")}` : "";
+  const chatRows = db.prepare(
+    `SELECT
+         id,
+         sourceKind,
+         chatSessionId,
+         roomId,
+         messageId,
+         projectId,
+         agentId,
+         inputTokens,
+         outputTokens,
+         cachedTokens,
+         cacheWriteTokens,
+         totalTokens,
+         modelProvider,
+         modelId,
+         createdAt
+       FROM chat_token_usage ${chatWhere}`
+  ).all(...chatParams);
   const totals = emptyTotals();
   const totalCost = emptyCostAccumulator();
   const groupMap = /* @__PURE__ */ new Map();
@@ -65636,34 +66027,70 @@ function aggregateTokenAnalytics(db, query = {}) {
   const granularity = query.granularity;
   const now = query.now;
   const pricingOverrides = query.pricingOverrides;
+  const totalContributionIds = /* @__PURE__ */ new Set();
+  const groupContributionIds = /* @__PURE__ */ new Map();
+  const seriesContributionIds = /* @__PURE__ */ new Map();
   for (const row of rows) {
-    addRow(totals, row);
-    addRowCost(totalCost, row, now, pricingOverrides);
-    if (groupBy) {
-      const groupRows = groupBy === "model" || groupBy === "provider" ? parsePerModelRows(row) : [];
-      const rowsForGroup = groupRows.length > 0 ? groupRows : [row];
-      for (const groupRow of rowsForGroup) {
-        const key = groupKeyFor(groupRow, groupBy);
+    const taskRow = { ...row, contributionKind: "task" };
+    const perModel = parsePerModelRows(row);
+    const rowInRange = isWithinRange(row.tokenUsageLastUsedAt, query.from, query.to);
+    const contributionRows = perModel.valid ? perModel.rows.filter((bucketRow) => isWithinRange(contributionTimestamp(bucketRow), query.from, query.to)) : rowInRange ? [taskRow] : [];
+    for (const contributionRow of contributionRows) {
+      addRow(totals, contributionRow, totalContributionIds);
+      addRowCost(totalCost, contributionRow, now, pricingOverrides);
+      if (groupBy) {
+        const key = groupKeyFor(contributionRow, groupBy);
         let group = groupMap.get(key);
         if (!group) {
           group = { key, ...emptyTotals(), cost: { usd: null, unavailable: false, stale: false } };
           groupMap.set(key, group);
           groupCostMap.set(key, emptyCostAccumulator());
+          groupContributionIds.set(key, /* @__PURE__ */ new Set());
+        }
+        addRow(group, contributionRow, groupContributionIds.get(key));
+        addRowCost(groupCostMap.get(key), contributionRow, now, pricingOverrides);
+      }
+      if (granularity) {
+        const bucket = bucketFor(contributionRow, granularity);
+        let point = seriesMap.get(bucket);
+        if (!point) {
+          point = { bucket, ...emptyTotals(), cost: { usd: null, unavailable: false, stale: false } };
+          seriesMap.set(bucket, point);
+          seriesCostMap.set(bucket, emptyCostAccumulator());
+          seriesContributionIds.set(bucket, /* @__PURE__ */ new Set());
         }
-        addRow(group, groupRow);
-        addRowCost(groupCostMap.get(key), groupRow, now, pricingOverrides);
+        addRow(point, contributionRow, seriesContributionIds.get(bucket));
+        addRowCost(seriesCostMap.get(bucket), contributionRow, now, pricingOverrides);
+      }
+    }
+  }
+  for (const row of chatRows) {
+    const contributionRow = { ...row, contributionKind: "chat" };
+    addRow(totals, contributionRow, totalContributionIds);
+    addRowCost(totalCost, contributionRow, now, pricingOverrides);
+    if (groupBy) {
+      const key = groupKeyFor(contributionRow, groupBy);
+      let group = groupMap.get(key);
+      if (!group) {
+        group = { key, ...emptyTotals(), cost: { usd: null, unavailable: false, stale: false } };
+        groupMap.set(key, group);
+        groupCostMap.set(key, emptyCostAccumulator());
+        groupContributionIds.set(key, /* @__PURE__ */ new Set());
       }
+      addRow(group, contributionRow, groupContributionIds.get(key));
+      addRowCost(groupCostMap.get(key), contributionRow, now, pricingOverrides);
     }
     if (granularity) {
-      const bucket = bucketFor(row, granularity);
+      const bucket = bucketFor(contributionRow, granularity);
       let point = seriesMap.get(bucket);
       if (!point) {
         point = { bucket, ...emptyTotals(), cost: { usd: null, unavailable: false, stale: false } };
         seriesMap.set(bucket, point);
         seriesCostMap.set(bucket, emptyCostAccumulator());
+        seriesContributionIds.set(bucket, /* @__PURE__ */ new Set());
       }
-      addRow(point, row);
-      addRowCost(seriesCostMap.get(bucket), row, now, pricingOverrides);
+      addRow(point, contributionRow, seriesContributionIds.get(bucket));
+      addRowCost(seriesCostMap.get(bucket), contributionRow, now, pricingOverrides);
     }
   }
   for (const [key, group] of groupMap) {
@@ -66939,6 +67366,113 @@ var init_github_issue_analytics = __esm({
   }
 });
 
+// ../core/src/gitlab-issue-analytics.ts
+function isInRange2(iso, query) {
+  const t = Date.parse(iso);
+  if (!Number.isFinite(t)) return false;
+  if (query.from !== void 0 && t < Date.parse(query.from)) return false;
+  if (query.to !== void 0 && t > Date.parse(query.to)) return false;
+  return true;
+}
+function dayKey2(iso) {
+  const t = Date.parse(iso);
+  if (!Number.isFinite(t)) return null;
+  return new Date(t).toISOString().slice(0, 10);
+}
+function projectFromItem(item) {
+  const projectPath = typeof item.projectPath === "string" ? item.projectPath.trim() : "";
+  if (projectPath) return projectPath;
+  const groupPath = typeof item.groupPath === "string" ? item.groupPath.trim() : "";
+  if (groupPath) return groupPath;
+  if (typeof item.projectId === "number" && Number.isFinite(item.projectId)) return String(item.projectId);
+  return "(unknown)";
+}
+function addDaily2(daily, date5, kind) {
+  const current = daily.get(date5) ?? { filed: 0, fixed: 0 };
+  current[kind] += 1;
+  daily.set(date5, current);
+}
+function addProject(byProject, project, kind) {
+  const current = byProject.get(project) ?? { filed: 0, fixed: 0 };
+  current[kind] += 1;
+  byProject.set(project, current);
+}
+function aggregateGitlabIssueAnalytics(db, query = {}) {
+  const daily = /* @__PURE__ */ new Map();
+  const byProject = /* @__PURE__ */ new Map();
+  const filedRows = db.prepare(
+    "SELECT gitlabTracking FROM tasks WHERE gitlabTracking IS NOT NULL AND gitlabTracking NOT IN ('', '{}')"
+  ).all();
+  let filed = 0;
+  for (const row of filedRows) {
+    if (!row.gitlabTracking) continue;
+    let parsed;
+    try {
+      parsed = JSON.parse(row.gitlabTracking);
+    } catch {
+      continue;
+    }
+    const item = parsed.item;
+    if (!item || typeof item.iid !== "number" || !Number.isFinite(item.iid)) continue;
+    const createdAt = typeof item.createdAt === "string" ? item.createdAt : void 0;
+    const hasUsableDate = createdAt !== void 0 && dayKey2(createdAt) !== null;
+    if (hasUsableDate && !isInRange2(createdAt, query)) continue;
+    filed += 1;
+    const project = projectFromItem(item);
+    addProject(byProject, project, "filed");
+    if (hasUsableDate && createdAt !== void 0) {
+      const day = dayKey2(createdAt);
+      if (day !== null) addDaily2(daily, day, "filed");
+    }
+  }
+  const fixedRows = db.prepare(
+    `SELECT id, title, sourceIssueRepository, sourceIssueNumber, sourceIssueUrl, sourceIssueClosedAt, updatedAt FROM tasks WHERE sourceIssueProvider = 'gitlab' AND "column" = 'done'`
+  ).all();
+  let fixed = 0;
+  const resolved = [];
+  for (const row of fixedRows) {
+    const hasExactResolvedAt = row.sourceIssueClosedAt !== null;
+    const fixedDate = row.sourceIssueClosedAt ?? row.updatedAt;
+    if (fixedDate === null || !isInRange2(fixedDate, query)) continue;
+    fixed += 1;
+    const project = row.sourceIssueRepository?.trim() || "(unknown)";
+    addProject(byProject, project, "fixed");
+    const day = dayKey2(fixedDate);
+    if (day !== null) addDaily2(daily, day, "fixed");
+    resolved.push({
+      taskId: row.id,
+      taskTitle: row.title ?? "",
+      project,
+      issueNumber: typeof row.sourceIssueNumber === "number" ? row.sourceIssueNumber : null,
+      url: row.sourceIssueUrl?.trim() || null,
+      resolvedAt: fixedDate,
+      resolvedAtExact: hasExactResolvedAt
+    });
+  }
+  resolved.sort((a, b2) => {
+    const byDate = Date.parse(b2.resolvedAt) - Date.parse(a.resolvedAt);
+    return byDate !== 0 ? byDate : a.taskId.localeCompare(b2.taskId);
+  });
+  return {
+    from: query.from ?? null,
+    to: query.to ?? null,
+    filed,
+    fixed,
+    net: filed - fixed,
+    daily: [...daily.entries()].map(([date5, counts]) => ({ date: date5, filed: counts.filed, fixed: counts.fixed })).sort((a, b2) => a.date.localeCompare(b2.date)),
+    byProject: [...byProject.entries()].map(([project, counts]) => ({ project, filed: counts.filed, fixed: counts.fixed })).sort((a, b2) => {
+      const total = b2.filed + b2.fixed - (a.filed + a.fixed);
+      return total !== 0 ? total : a.project.localeCompare(b2.project);
+    }),
+    resolved
+  };
+}
+var init_gitlab_issue_analytics = __esm({
+  "../core/src/gitlab-issue-analytics.ts"() {
+    "use strict";
+  }
+});
+
 // ../core/src/command-center-live.ts
 function composeLiveSnapshot(db, now) {
   const capturedAt = new Date(now ?? Date.now()).toISOString();
@@ -67306,7 +67840,7 @@ var init_daemon_token = __esm({
 // ../core/src/pi-extensions.ts
 import { existsSync as existsSync17, mkdirSync as mkdirSync7, readdirSync as readdirSync2, readFileSync as readFileSync4, statSync as statSync5, writeFileSync as writeFileSync2 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
-import { basename as basename8, dirname as dirname8, isAbsolute as isAbsolute5, join as join21, relative as relative2, resolve as resolve10, sep as sep4, win32 } from "node:path";
+import { basename as basename8, dirname as dirname9, isAbsolute as isAbsolute5, join as join21, relative as relative2, resolve as resolve10, sep as sep4, win32 } from "node:path";
 import { createRequire as createRequire3 } from "node:module";
 function getSpawnSync() {
   if (!didLoadSpawnSync) {
@@ -67382,7 +67916,7 @@ function getProjectRootFromGitLinkedWorktree(cwd) {
   if (!resolvedCommonDir || !resolvedGitDir || resolvedCommonDir === resolvedGitDir) {
     return null;
   }
-  const parentRoot = resolvedCommonDir.endsWith(`${sep4}.git`) ? dirname8(resolvedCommonDir) : resolvedCommonDir;
+  const parentRoot = resolvedCommonDir.endsWith(`${sep4}.git`) ? dirname9(resolvedCommonDir) : resolvedCommonDir;
   return existsSync17(join21(parentRoot, ".fusion")) ? parentRoot : null;
 }
 function resolvePiExtensionProjectRoot(cwd) {
@@ -69097,7 +69631,7 @@ var init_plugin_security_scan = __esm({
 });
 
 // ../core/src/plugin-loader.ts
-import { basename as basename9, dirname as dirname9, extname, isAbsolute as isAbsolute6, join as join23, resolve as resolve11 } from "node:path";
+import { basename as basename9, dirname as dirname10, extname, isAbsolute as isAbsolute6, join as join23, resolve as resolve11 } from "node:path";
 import { existsSync as existsSync19, readdirSync as readdirSync3, statSync as statSync6 } from "node:fs";
 import { copyFile, readFile as readFile10, stat as stat4 } from "node:fs/promises";
 import { pathToFileURL } from "node:url";
@@ -69377,7 +69911,7 @@ var init_plugin_loader = __esm({
           moduleImportVersion += 1;
           const ext = extname(path6);
           const baseName = basename9(path6, ext);
-          const reloadedPath = resolve11(dirname9(path6), `.${baseName}.reload-${moduleImportVersion}${ext}`);
+          const reloadedPath = resolve11(dirname10(path6), `.${baseName}.reload-${moduleImportVersion}${ext}`);
           await copyFile(path6, reloadedPath);
           mod = await import(pathToFileURL(reloadedPath).href);
         } else {
@@ -69869,10 +70403,10 @@ var init_plugin_loader = __esm({
           }
         } catch {
         }
-        const entryDir = dirname9(pluginEntryPath);
+        const entryDir = dirname10(pluginEntryPath);
         candidates.add(join23(entryDir, "manifest.json"));
         if (PLUGIN_MANIFEST_PARENT_DIR_NAMES.has(basename9(entryDir))) {
-          candidates.add(join23(dirname9(entryDir), "manifest.json"));
+          candidates.add(join23(dirname10(entryDir), "manifest.json"));
         }
         for (const candidate of candidates) {
           try {
@@ -70682,7 +71216,7 @@ var init_backup = __esm({
 // ../core/src/memory-backup.ts
 import { cp as cp2, mkdir as mkdir9, readdir as readdir7, readFile as readFile11, rename as rename6, rm as rm2, stat as stat6, writeFile as writeFile7 } from "node:fs/promises";
 import { existsSync as existsSync21 } from "node:fs";
-import { dirname as dirname10, join as join25, relative as relative3, resolve as resolve12, sep as sep5 } from "node:path";
+import { dirname as dirname11, join as join25, relative as relative3, resolve as resolve12, sep as sep5 } from "node:path";
 function createMemoryBackupManager(fusionDir, settings) {
   return new MemoryBackupManager(fusionDir, {
     backupDir: sanitizeMemoryBackupDir(fusionDir, canonicalizeMemoryBackupDir(settings?.memoryBackupDir)),
@@ -70964,7 +71498,7 @@ var init_memory_backup = __esm({
         for (const file2 of files) {
           const rel = relative3(sourceDir, file2);
           const destFile = join25(destinationDir, rel);
-          await mkdir9(dirname10(destFile), { recursive: true });
+          await mkdir9(dirname11(destFile), { recursive: true });
           if (existsSync21(destFile) && !overwrite) {
             const [srcBuf, dstBuf] = await Promise.all([readFile11(file2), readFile11(destFile)]);
             if (!srcBuf.equals(dstBuf)) {
@@ -72181,7 +72715,7 @@ var init_docker_provisioning = __esm({
 // ../core/src/memory-insights.ts
 import { readFile as readFile14, writeFile as writeFile9, mkdir as mkdir10, unlink as unlink5 } from "node:fs/promises";
 import { existsSync as existsSync22 } from "node:fs";
-import { dirname as dirname11, join as join26 } from "node:path";
+import { dirname as dirname12, join as join26 } from "node:path";
 async function readWorkingMemory(rootDir) {
   const filePath = join26(rootDir, MEMORY_WORKING_PATH);
   if (!existsSync22(filePath)) {
@@ -72196,7 +72730,7 @@ async function migrateLegacyArtifactIfNeeded(rootDir, canonicalPath, legacyPath)
     return;
   }
   const content = await readFile14(legacyFilePath, "utf-8");
-  const canonicalDir = dirname11(canonicalFilePath);
+  const canonicalDir = dirname12(canonicalFilePath);
   if (!existsSync22(canonicalDir)) {
     await mkdir10(canonicalDir, { recursive: true });
   }
@@ -72226,7 +72760,7 @@ async function readInsightsMemory(rootDir) {
 }
 async function writeInsightsMemory(rootDir, content) {
   const filePath = join26(rootDir, MEMORY_INSIGHTS_PATH);
-  const dir = dirname11(filePath);
+  const dir = dirname12(filePath);
   if (!existsSync22(dir)) {
     await mkdir10(dir, { recursive: true });
   }
@@ -72235,7 +72769,7 @@ async function writeInsightsMemory(rootDir, content) {
 }
 async function writeWorkingMemory(rootDir, content) {
   const filePath = join26(rootDir, MEMORY_WORKING_PATH);
-  const dir = dirname11(filePath);
+  const dir = dirname12(filePath);
   if (!existsSync22(dir)) {
     await mkdir10(dir, { recursive: true });
   }
@@ -72251,7 +72785,7 @@ async function readMemoryAudit(rootDir) {
 }
 async function writeMemoryAudit(rootDir, content) {
   const filePath = join26(rootDir, MEMORY_AUDIT_PATH);
-  const dir = dirname11(filePath);
+  const dir = dirname12(filePath);
   if (!existsSync22(dir)) {
     await mkdir10(dir, { recursive: true });
   }
@@ -72280,7 +72814,7 @@ async function readMemoryAuditState(rootDir) {
 }
 async function writeMemoryAuditState(rootDir, state) {
   const filePath = join26(rootDir, MEMORY_AUDIT_STATE_PATH);
-  const dir = dirname11(filePath);
+  const dir = dirname12(filePath);
   if (!existsSync22(dir)) {
     await mkdir10(dir, { recursive: true });
   }
@@ -87517,6 +88051,25 @@ var init_chat_store = __esm({
           createdAt: row.createdAt
         };
       }
+      rowToTokenUsage(row) {
+        return {
+          id: row.id,
+          sourceKind: row.sourceKind,
+          chatSessionId: row.chatSessionId ?? null,
+          roomId: row.roomId ?? null,
+          messageId: row.messageId ?? null,
+          projectId: row.projectId ?? null,
+          agentId: row.agentId ?? null,
+          modelProvider: row.modelProvider ?? null,
+          modelId: row.modelId ?? null,
+          inputTokens: row.inputTokens ?? 0,
+          outputTokens: row.outputTokens ?? 0,
+          cachedTokens: row.cachedTokens ?? 0,
+          cacheWriteTokens: row.cacheWriteTokens ?? 0,
+          totalTokens: row.totalTokens ?? 0,
+          createdAt: row.createdAt
+        };
+      }
       normalizeRoomName(name) {
         return name.trim().replace(/^#+/, "").trim();
       }
@@ -88265,6 +88818,62 @@ var init_chat_store = __esm({
         this.emit("chat:room:message:updated", updated);
         return updated;
       }
+      recordTokenUsage(input) {
+        const inputTokens = Math.max(0, Math.trunc(input.inputTokens));
+        const outputTokens = Math.max(0, Math.trunc(input.outputTokens));
+        const cachedTokens = Math.max(0, Math.trunc(input.cachedTokens));
+        const cacheWriteTokens = Math.max(0, Math.trunc(input.cacheWriteTokens));
+        const totalTokens = Math.max(0, Math.trunc(input.totalTokens ?? inputTokens + outputTokens + cachedTokens + cacheWriteTokens));
+        if (inputTokens === 0 && outputTokens === 0 && cachedTokens === 0 && cacheWriteTokens === 0 && totalTokens === 0) {
+          return void 0;
+        }
+        const record2 = {
+          id: `chat-tokens-${randomUUID19().slice(0, 12)}`,
+          sourceKind: input.sourceKind,
+          chatSessionId: input.chatSessionId ?? null,
+          roomId: input.roomId ?? null,
+          messageId: input.messageId ?? null,
+          projectId: input.projectId ?? null,
+          agentId: input.agentId ?? null,
+          modelProvider: input.modelProvider ?? null,
+          modelId: input.modelId ?? null,
+          inputTokens,
+          outputTokens,
+          cachedTokens,
+          cacheWriteTokens,
+          totalTokens,
+          createdAt: input.createdAt ?? (/* @__PURE__ */ new Date()).toISOString()
+        };
+        this.db.prepare(`
+      INSERT INTO chat_token_usage (
+        id, sourceKind, chatSessionId, roomId, messageId, projectId, agentId,
+        modelProvider, modelId, inputTokens, outputTokens, cachedTokens,
+        cacheWriteTokens, totalTokens, createdAt
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `).run(
+          record2.id,
+          record2.sourceKind,
+          record2.chatSessionId,
+          record2.roomId,
+          record2.messageId,
+          record2.projectId,
+          record2.agentId,
+          record2.modelProvider,
+          record2.modelId,
+          record2.inputTokens,
+          record2.outputTokens,
+          record2.cachedTokens,
+          record2.cacheWriteTokens,
+          record2.totalTokens,
+          record2.createdAt
+        );
+        this.db.bumpLastModified();
+        return record2;
+      }
+      listTokenUsage() {
+        const rows = this.db.prepare("SELECT * FROM chat_token_usage ORDER BY createdAt ASC").all();
+        return rows.map((row) => this.rowToTokenUsage(row));
+      }
     };
   }
 });
@@ -88947,6 +89556,8 @@ __export(src_exports, {
   DEFAULT_DEPENDENCY_BLOCKED_TODO_MIN_COUNT: () => DEFAULT_DEPENDENCY_BLOCKED_TODO_MIN_COUNT,
   DEFAULT_DEPENDENCY_BLOCKED_TODO_STALE_MS: () => DEFAULT_DEPENDENCY_BLOCKED_TODO_STALE_MS,
   DEFAULT_EXECUTION_MODE: () => DEFAULT_EXECUTION_MODE,
+  DEFAULT_GITLAB_API_BASE_URL: () => DEFAULT_GITLAB_API_BASE_URL,
+  DEFAULT_GITLAB_INSTANCE_URL: () => DEFAULT_GITLAB_INSTANCE_URL,
   DEFAULT_GLOBAL_SETTINGS: () => DEFAULT_GLOBAL_SETTINGS,
   DEFAULT_HEARTBEAT_PROCEDURE_PATH: () => DEFAULT_HEARTBEAT_PROCEDURE_PATH,
   DEFAULT_INSIGHT_SCHEDULE: () => DEFAULT_INSIGHT_SCHEDULE,
@@ -89099,6 +89710,10 @@ __export(src_exports, {
   OTEL_METRIC_PREFIX: () => OTEL_METRIC_PREFIX,
   OccupiedColumnsError: () => OccupiedColumnsError,
   PERMANENT_AGENT_ACTION_CATEGORIES: () => PERMANENT_AGENT_ACTION_CATEGORIES,
+  PLANNING_DEEPEN_CHECKPOINT_ID: () => PLANNING_DEEPEN_CHECKPOINT_ID,
+  PLANNING_DEEPEN_CHECKPOINT_QUESTION: () => PLANNING_DEEPEN_CHECKPOINT_QUESTION,
+  PLANNING_DEEPEN_PROCEED_OPTION_ID: () => PLANNING_DEEPEN_PROCEED_OPTION_ID,
+  PLANNING_DEEPEN_PROCEED_RESPONSE_KEY: () => PLANNING_DEEPEN_PROCEED_RESPONSE_KEY,
   PLAN_REVIEW_GROUP_ID: () => PLAN_REVIEW_GROUP_ID,
   PLAN_REVIEW_MAX_REVISIONS_SETTING_ID: () => PLAN_REVIEW_MAX_REVISIONS_SETTING_ID,
   PLUGIN_TRAIT_ALLOWED_HOOK_POINTS: () => PLUGIN_TRAIT_ALLOWED_HOOK_POINTS,
@@ -89227,6 +89842,7 @@ __export(src_exports, {
   aggregateActivityAnalytics: () => aggregateActivityAnalytics,
   aggregateAgentTokenUsage: () => aggregateAgentTokenUsage,
   aggregateGithubIssueAnalytics: () => aggregateGithubIssueAnalytics,
+  aggregateGitlabIssueAnalytics: () => aggregateGitlabIssueAnalytics,
   aggregateMonitorMetrics: () => aggregateMonitorMetrics,
   aggregatePluginActivations: () => aggregatePluginActivations,
   aggregateProductivityAnalytics: () => aggregateProductivityAnalytics,
@@ -89401,6 +90017,7 @@ __export(src_exports, {
   findWorkflowColumn: () => findWorkflowColumn,
   formatCurrentTaskLine: () => formatCurrentTaskLine,
   formatDistributedTaskId: () => formatDistributedTaskId,
+  formatGitLabTrackedItemRef: () => formatGitLabTrackedItemRef,
   formatPiExtensionSource: () => formatPiExtensionSource,
   formatRoleMismatchReason: () => formatRoleMismatchReason,
   formatTaskListText: () => formatTaskListText,
@@ -89503,6 +90120,7 @@ __export(src_exports, {
   isFinalizeRecord: () => isFinalizeRecord,
   isGhAuthenticated: () => isGhAuthenticated,
   isGhAvailable: () => isGhAvailable,
+  isGitLabTrackingStale: () => isGitLabTrackingStale,
   isGlobalSettingsKey: () => isGlobalSettingsKey,
   isHookRecord: () => isHookRecord,
   isImplementationTask: () => isImplementationTask,
@@ -89690,6 +90308,8 @@ __export(src_exports, {
   resolveEntryPointBranchAssignment: () => resolveEntryPointBranchAssignment,
   resolveEvalSettings: () => resolveEvalSettings,
   resolveExecutionSettingsModel: () => resolveExecutionSettingsModel,
+  resolveGitlabConfig: () => resolveGitlabConfig,
+  resolveGitlabEnabled: () => resolveGitlabEnabled,
   resolveGlobalDir: () => resolveGlobalDir,
   resolveGlobalDirForHome: () => resolveGlobalDirForHome,
   resolveLocalNodeId: () => resolveLocalNodeId,
@@ -89865,6 +90485,7 @@ var init_src = __esm({
     init_redact_secrets();
     init_plan_approval();
     init_near_duplicate_canonical();
+    init_gitlab_tracking();
     init_frontend_ux_policy();
     init_file_scope_classification();
     init_task_list_format();
@@ -89954,6 +90575,7 @@ var init_src = __esm({
     init_team_analytics();
     init_workflow_analytics();
     init_github_issue_analytics();
+    init_gitlab_issue_analytics();
     init_activity_analytics();
     init_command_center_live();
     init_otel_metrics();
@@ -90616,7 +91238,10 @@ var init_gating_classifications = __esm({
       ...PERMANENT_AND_ACTION_TASK_AGENT_TOOLS,
       "fn_delegate_task",
       "fn_task_import_github",
-      "fn_task_import_github_issue"
+      "fn_task_import_github_issue",
+      "fn_task_import_gitlab_project_issues",
+      "fn_task_import_gitlab_group_issues",
+      "fn_task_import_gitlab_merge_requests"
     ];
     ACTION_GATE_SHARED_TASK_AGENT_TOOLS = SHARED_TASK_AGENT_TOOLS.filter(
       (tool) => !PROVISIONING_TOOLS.includes(tool)
@@ -90694,6 +91319,12 @@ var init_gating_classifications = __esm({
       "fn_delegate_task",
       "fn_task_import_github",
       "fn_task_import_github_issue",
+      "fn_task_import_gitlab_project_issues",
+      "fn_task_import_gitlab_group_issues",
+      "fn_task_import_gitlab_merge_requests",
+      "fn_task_browse_gitlab_project_issues",
+      "fn_task_browse_gitlab_group_issues",
+      "fn_task_browse_gitlab_merge_requests",
       "fn_research_list",
       "fn_research_get",
       "fn_insight_list",
@@ -90962,7 +91593,7 @@ var init_agent_action_gate = __esm({
 import { existsSync as existsSync25, readFileSync as readFileSync8 } from "node:fs";
 import { homedir as homedir5 } from "node:os";
 import { join as join30 } from "node:path";
-import { AuthStorage } from "@earendil-works/pi-coding-agent";
+import { AuthStorage, ModelRegistry } from "@earendil-works/pi-coding-agent";
 import { getOAuthProvider } from "@earendil-works/pi-ai/oauth";
 function getHomeDir5() {
   return process.env.HOME || process.env.USERPROFILE || homedir5();
@@ -91152,6 +91783,9 @@ function readModelsJsonApiKeys(home = getHomeDir5()) {
   }
   return apiKeys;
 }
+function createFusionModelRegistry(authStorage, home) {
+  return ModelRegistry.create(authStorage, getModelRegistryModelsPath(home));
+}
 function createFusionAuthStorage() {
   const primary = AuthStorage.create(getFusionAuthPath());
   let supplementalCredentials = readSupplementalCredentials();
@@ -92892,7 +93526,7 @@ var init_github_provider = __esm({
 
 // ../engine/src/skill-resolver.ts
 import { existsSync as existsSync26, readFileSync as readFileSync9 } from "node:fs";
-import { dirname as dirname12, join as join31, resolve as resolve15 } from "node:path";
+import { dirname as dirname13, join as join31, resolve as resolve15 } from "node:path";
 function resolveProjectRoot(cwd) {
   const worktreeProjectRoot = getProjectRootFromWorktree(cwd);
   if (worktreeProjectRoot && existsSync26(join31(worktreeProjectRoot, ".fusion"))) {
@@ -92903,7 +93537,7 @@ function resolveProjectRoot(cwd) {
     if (existsSync26(join31(current, ".fusion"))) {
       return current;
     }
-    const parent = dirname12(current);
+    const parent = dirname13(current);
     if (parent === current) {
       return resolve15(cwd);
     }
@@ -119000,7 +119634,7 @@ import { existsSync as existsSync27, readFileSync as readFileSync11, realpathSyn
 import { exec as exec2, execFile as execFile4 } from "node:child_process";
 import { promisify as promisify4 } from "node:util";
 import { createRequire as createRequire4 } from "node:module";
-import { basename as basename10, dirname as dirname13, join as join33, relative as relative4, isAbsolute as isAbsolute8, resolve as resolve16 } from "node:path";
+import { basename as basename10, dirname as dirname14, join as join33, relative as relative4, isAbsolute as isAbsolute8, resolve as resolve16 } from "node:path";
 import {
   createAgentSession,
   createBashTool,
@@ -119016,7 +119650,7 @@ import {
   DefaultResourceLoader,
   DefaultPackageManager,
   discoverAndLoadExtensions,
-  ModelRegistry,
+  ModelRegistry as ModelRegistry2,
   SessionManager,
   SettingsManager
 } from "@earendil-works/pi-coding-agent";
@@ -119794,7 +120428,7 @@ function siblingAgentDir(agentDir, siblingRoot) {
   if (basename10(agentDir) !== "agent") {
     return void 0;
   }
-  return join33(dirname13(dirname13(agentDir)), siblingRoot, "agent");
+  return join33(dirname14(dirname14(agentDir)), siblingRoot, "agent");
 }
 function createReadOnlyPiSettingsView(cwd, agentDir) {
   const projectRoot = resolvePiExtensionProjectRoot(cwd);
@@ -119838,7 +120472,7 @@ function resolveVendoredClaudeCliEntry() {
     if (!Array.isArray(extensions) || extensions.length === 0) return null;
     const entry = extensions[0];
     if (typeof entry !== "string" || entry.length === 0) return null;
-    const path6 = resolve16(dirname13(pkgJsonPath), entry);
+    const path6 = resolve16(dirname14(pkgJsonPath), entry);
     return existsSync27(path6) ? path6 : null;
   } catch {
     return null;
@@ -119853,7 +120487,7 @@ function resolveVendoredDroidCliEntry() {
     if (!Array.isArray(extensions) || extensions.length === 0) return null;
     const entry = extensions[0];
     if (typeof entry !== "string" || entry.length === 0) return null;
-    const path6 = resolve16(dirname13(pkgJsonPath), entry);
+    const path6 = resolve16(dirname14(pkgJsonPath), entry);
     return existsSync27(path6) ? path6 : null;
   } catch {
     return null;
@@ -120237,7 +120871,7 @@ async function createFnAgent2(options) {
     logMcpForwardingSkipped({ runtimeId: "pi", provider: options.defaultProvider, skippedCount: requestedMcpServers.length, lane: "createFnAgent" });
   }
   const authStorage = createFusionAuthStorage();
-  const modelRegistry = ModelRegistry.create(authStorage, getModelRegistryModelsPath());
+  const modelRegistry = ModelRegistry2.create(authStorage, getModelRegistryModelsPath());
   const resolvedProjectRoot = getProjectRootFromWorktree(options.cwd) ?? resolvePiExtensionProjectRoot(options.cwd);
   await registerExtensionProviders(resolvedProjectRoot, modelRegistry);
   const customProviders = readCustomProviders();
@@ -120499,8 +121133,25 @@ async function createFnAgent2(options) {
       throw error2;
     }
   };
+  const modelDescription = (model) => model ? `${model.provider}/${model.id}` : "unknown model";
+  const configuredFallbackDiffers = Boolean(
+    options.fallbackProvider && options.fallbackModelId && (options.fallbackProvider !== options.defaultProvider || options.fallbackModelId !== options.defaultModelId)
+  );
+  const hasDistinctFallback = Boolean(
+    selectedModel && fallbackModel && (configuredFallbackDiffers || selectedModel.provider !== fallbackModel.provider || selectedModel.id !== fallbackModel.id)
+  );
+  const makeFallbackExhaustedError = (triggerPoint, attempts, underlying) => {
+    const underlyingReason = underlying instanceof Error ? underlying.message : String(underlying);
+    return new ModelFallbackExhaustedError({
+      primaryModel: modelDescription(selectedModel),
+      fallbackModel: hasDistinctFallback ? modelDescription(fallbackModel) : void 0,
+      triggerPoint,
+      attempts,
+      underlyingReason
+    });
+  };
   const emitFallbackUsed = async (triggerPoint) => {
-    if (!options.onFallbackModelUsed || !selectedModel || !fallbackModel) {
+    if (!options.onFallbackModelUsed || !selectedModel || !fallbackModel || !hasDistinctFallback) {
       return;
     }
     await options.onFallbackModelUsed({
@@ -120518,13 +121169,17 @@ async function createFnAgent2(options) {
     sessionResult = await createSessionWithModel(selectedModel);
     piLog.log(`Session created successfully (model=${selectedModel ? `${selectedModel.provider}/${selectedModel.id}` : "default"})`);
   } catch (err) {
-    if (!fallbackModel || !selectedModel || !isRetryableModelSelectionError(err?.message || "")) {
+    if (!fallbackModel || !selectedModel || !hasDistinctFallback || !isRetryableModelSelectionError(err?.message || "")) {
       piLog.error(`Session creation failed: ${err.message}`);
       throw err;
     }
     piLog.warn(`Primary model failed (${err.message}), trying fallback`);
     usingFallback = true;
-    sessionResult = await createSessionWithModel(fallbackModel);
+    try {
+      sessionResult = await createSessionWithModel(fallbackModel);
+    } catch (fallbackErr) {
+      throw makeFallbackExhaustedError("session-creation", 2, fallbackErr);
+    }
     await emitFallbackUsed("session-creation");
     piLog.log("Fallback session created successfully");
   }
@@ -120652,6 +121307,9 @@ async function createFnAgent2(options) {
       if (!fallbackModel || usingFallback || !isRetryableModelSelectionError(errorMessage2)) {
         throw err;
       }
+      if (!hasDistinctFallback) {
+        throw makeFallbackExhaustedError("prompt-time", 1, err);
+      }
       usingFallback = true;
       const fallbackSession = await swapPromptSession(fallbackModel);
       await emitFallbackUsed("prompt-time");
@@ -120699,7 +121357,7 @@ async function createFnAgent2(options) {
             throw fallbackErr;
           }
         }
-        throw fallbackErr;
+        throw makeFallbackExhaustedError("prompt-time", 2, fallbackErr);
       }
     }
   };
@@ -120726,7 +121384,7 @@ async function createFnAgent2(options) {
   });
   return { session: promptableSession, sessionFile: promptableSession.sessionFile };
 }
-var execAsync, RTK_ACCEPTED_REWRITE_EXIT_CODES, RTK_EXPECTED_PASSTHROUGH_EXIT_CODES, RTK_EXPECTED_FAIL_OPEN_ERROR_CODES, RTK_REWRITE_MAX_BUFFER_BYTES, hostExtensionPaths, FN_MEMORY_APPEND_TOOL_NAME, FUSION_SHUTDOWN_WRAP_FLAG, promptWithFallbackInFlight, COMPACTION_FALLBACK_INSTRUCTIONS, MAX_COMPACTED_PROMPT_MEMORY_CHARS, MAX_COMPACTED_SUBTASK_GUIDANCE_CHARS, MAX_COMPACTED_ATTACHMENTS_CHARS, MAX_COMPACTED_EXISTING_SPEC_CHARS, MAX_COMPACTED_TASK_PROMPT_CHARS, MAX_COMPACTED_USER_COMMENTS_CHARS, GATE_BYPASS_TOOL_NAMES;
+var execAsync, RTK_ACCEPTED_REWRITE_EXIT_CODES, RTK_EXPECTED_PASSTHROUGH_EXIT_CODES, RTK_EXPECTED_FAIL_OPEN_ERROR_CODES, RTK_REWRITE_MAX_BUFFER_BYTES, hostExtensionPaths, FN_MEMORY_APPEND_TOOL_NAME, FUSION_SHUTDOWN_WRAP_FLAG, promptWithFallbackInFlight, COMPACTION_FALLBACK_INSTRUCTIONS, MAX_COMPACTED_PROMPT_MEMORY_CHARS, MAX_COMPACTED_SUBTASK_GUIDANCE_CHARS, MAX_COMPACTED_ATTACHMENTS_CHARS, MAX_COMPACTED_EXISTING_SPEC_CHARS, MAX_COMPACTED_TASK_PROMPT_CHARS, MAX_COMPACTED_USER_COMMENTS_CHARS, ModelFallbackExhaustedError, GATE_BYPASS_TOOL_NAMES;
 var init_pi = __esm({
   "../engine/src/pi.ts"() {
     "use strict";
@@ -120766,6 +121424,25 @@ var init_pi = __esm({
     MAX_COMPACTED_EXISTING_SPEC_CHARS = 4e3;
     MAX_COMPACTED_TASK_PROMPT_CHARS = MAX_COMPACTED_EXISTING_SPEC_CHARS;
     MAX_COMPACTED_USER_COMMENTS_CHARS = 2e3;
+    ModelFallbackExhaustedError = class extends Error {
+      primaryModel;
+      fallbackModel;
+      triggerPoint;
+      attempts;
+      underlyingReason;
+      constructor(input) {
+        const fallbackClause = input.fallbackModel ? `, fallback ${input.fallbackModel}` : ", no fallback configured";
+        super(
+          `Unable to select a usable model after ${input.attempts} attempt${input.attempts === 1 ? "" : "s"} (primary ${input.primaryModel}${fallbackClause}, trigger: ${input.triggerPoint}): ${input.underlyingReason}`
+        );
+        this.name = "ModelFallbackExhaustedError";
+        this.primaryModel = input.primaryModel;
+        this.fallbackModel = input.fallbackModel;
+        this.triggerPoint = input.triggerPoint;
+        this.attempts = input.attempts;
+        this.underlyingReason = input.underlyingReason;
+      }
+    };
     GATE_BYPASS_TOOL_NAMES = /* @__PURE__ */ new Set([
       "fn_heartbeat_done",
       "fn_send_message",
@@ -122237,11 +122914,17 @@ function normalize6(value) {
   }
   return value.trim().replace(/^refs\/heads\//, "").replace(/^refs\/remotes\/origin\//, "").replace(/^origin\//, "");
 }
-function warnFallback(rootDir, logger3) {
+function warnFallback(rootDir, logger3, remotes = []) {
   if (warnedFallbackRootDirs.has(rootDir)) {
     return;
   }
   warnedFallbackRootDirs.add(rootDir);
+  if (remotes.length > 0) {
+    const remoteList = remotes.join(", ");
+    const originState = remotes.includes("origin") ? "origin/HEAD is unset" : "origin is absent";
+    logger3.warn(`[integration-branch] falling back to 'main' \u2014 auto-detect checks origin/HEAD, but ${originState}; found remote ${remoteList}. Add an origin alias or set integrationBranch manually.`);
+    return;
+  }
   logger3.warn("[integration-branch] falling back to 'main' \u2014 origin/HEAD unset and no project override");
 }
 function resolveFromSettings(settings) {
@@ -122278,6 +122961,36 @@ function resolveFromOriginHeadSync(rootDir) {
     return "";
   }
 }
+function parseRemotes(stdout) {
+  return [...new Set(stdout.split(/\r?\n/).map((line) => line.trim()).filter(Boolean))];
+}
+async function listGitRemotes(rootDir) {
+  try {
+    const { stdout } = await execAsync2("git remote", {
+      cwd: rootDir,
+      encoding: "utf8",
+      timeout: 5e3,
+      maxBuffer: 1024 * 1024
+    });
+    return parseRemotes(stdout);
+  } catch {
+    return [];
+  }
+}
+function listGitRemotesSync(rootDir) {
+  try {
+    const stdout = execSync("git remote", {
+      cwd: rootDir,
+      encoding: "utf8",
+      timeout: 5e3,
+      maxBuffer: 1024 * 1024,
+      stdio: ["ignore", "pipe", "ignore"]
+    });
+    return parseRemotes(stdout);
+  } catch {
+    return [];
+  }
+}
 async function resolveIntegrationBranch(rootDir, settings, opts = {}) {
   const logger3 = opts.logger ?? console;
   const fromSettings = resolveFromSettings(settings);
@@ -122288,7 +123001,8 @@ async function resolveIntegrationBranch(rootDir, settings, opts = {}) {
   if (fromOrigin.length > 0) {
     return fromOrigin;
   }
-  warnFallback(rootDir, logger3);
+  const remotes = await listGitRemotes(rootDir);
+  warnFallback(rootDir, logger3, remotes);
   return INTEGRATION_BRANCH_FALLBACK;
 }
 function resolveIntegrationBranchSync(rootDir, settings, opts = {}) {
@@ -122301,7 +123015,8 @@ function resolveIntegrationBranchSync(rootDir, settings, opts = {}) {
   if (fromOrigin.length > 0) {
     return fromOrigin;
   }
-  warnFallback(rootDir, logger3);
+  const remotes = listGitRemotesSync(rootDir);
+  warnFallback(rootDir, logger3, remotes);
   return INTEGRATION_BRANCH_FALLBACK;
 }
 function __resetIntegrationBranchCacheForTests() {
@@ -123543,7 +124258,7 @@ var init_active_session_registry = __esm({
 // ../engine/src/worktree-hooks.ts
 import { exec as exec6 } from "node:child_process";
 import * as fs4 from "node:fs/promises";
-import { dirname as dirname14, resolve as resolve18 } from "node:path";
+import { dirname as dirname15, resolve as resolve18 } from "node:path";
 import { promisify as promisify8 } from "node:util";
 function toShellCasePattern(pattern) {
   return pattern.replace(/^\^/, "").replace(/\$$/, "").replace(/\\d\+/g, "[0-9]*").replace(/\[a-z0-9-\]\+/g, "[a-z0-9-]*");
@@ -123733,7 +124448,7 @@ git interpret-trailers   --in-place   --if-exists doNothing   --trailer "$TRAILE
 `;
 }
 async function writeFileAtomic(targetPath, content, mode) {
-  await fs4.mkdir(dirname14(targetPath), { recursive: true });
+  await fs4.mkdir(dirname15(targetPath), { recursive: true });
   const tmpPath = `${targetPath}.tmp`;
   const current = await fs4.readFile(targetPath, "utf-8").catch(() => null);
   if (current === content) return;
@@ -123889,7 +124604,7 @@ var init_worktree_prune = __esm({
 // ../engine/src/worktree-stale-lock.ts
 import { exec as exec8 } from "node:child_process";
 import { readFile as readFile16, stat as stat7, unlink as unlink6 } from "node:fs/promises";
-import { dirname as dirname15, resolve as resolve19 } from "node:path";
+import { dirname as dirname16, resolve as resolve19 } from "node:path";
 import { promisify as promisify10 } from "node:util";
 function parseIndexLockPath(stderr) {
   const match = /unable to create ['"]([^'"]*index\.lock)['"]:\s*File exists/i.exec(stderr);
@@ -123911,15 +124626,15 @@ async function resolveOwningWorktreePath(input) {
   }
   const worktreeName = parseWorktreeNameFromLockPath(input.lockPath);
   if (!worktreeName) return void 0;
-  const gitdirFile = resolve19(dirname15(input.lockPath), "gitdir");
+  const gitdirFile = resolve19(dirname16(input.lockPath), "gitdir");
   try {
     const gitdirRef = (await readFile16(gitdirFile, "utf-8")).trim();
     if (gitdirRef) {
-      const resolvedGitdirRef = resolve19(dirname15(gitdirFile), gitdirRef);
+      const resolvedGitdirRef = resolve19(dirname16(gitdirFile), gitdirRef);
       if (resolvedGitdirRef.endsWith("/.git") || resolvedGitdirRef.endsWith("\\.git")) {
-        return dirname15(resolvedGitdirRef);
+        return dirname16(resolvedGitdirRef);
       }
-      return dirname15(resolvedGitdirRef);
+      return dirname16(resolvedGitdirRef);
     }
   } catch {
   }
@@ -125207,7 +125922,7 @@ __export(worktree_pool_exports, {
 import { exec as exec11 } from "node:child_process";
 import { promisify as promisify13 } from "node:util";
 import { existsSync as existsSync31, lstatSync, readdirSync as readdirSync5, readFileSync as readFileSync12, rmSync as rmSync3, realpathSync as realpathSync6 } from "node:fs";
-import { basename as basename12, dirname as dirname16, join as join35, relative as relative6, resolve as resolve22, isAbsolute as isAbsolute9 } from "node:path";
+import { basename as basename12, dirname as dirname17, join as join35, relative as relative6, resolve as resolve22, isAbsolute as isAbsolute9 } from "node:path";
 async function getWorktrunkBinary(settings) {
   const cacheKey = `${process.env.HOME ?? ""}::${settings.binaryPath ?? ""}`;
   const cached2 = _worktrunkBinaryCache.get(cacheKey);
@@ -125498,7 +126213,7 @@ function dotGitPointerIsDangling(dotGitPath) {
     const match = /^gitdir:\s*(.+)$/.exec(raw);
     if (!match) return false;
     const target = match[1].trim();
-    const resolved = isAbsolute9(target) ? target : resolve22(dirname16(dotGitPath), target);
+    const resolved = isAbsolute9(target) ? target : resolve22(dirname17(dotGitPath), target);
     return !existsSync31(resolved);
   } catch {
     return false;
@@ -126399,7 +127114,7 @@ var init_worktrunk_failure_handler = __esm({
 // ../engine/src/worktree-copy-files.ts
 import { constants as fsConstants2 } from "node:fs";
 import { access as access5, copyFile as copyFile2, lstat, mkdir as mkdir13 } from "node:fs/promises";
-import { dirname as dirname17, isAbsolute as isAbsolute11, relative as relative8, resolve as resolve24 } from "node:path";
+import { dirname as dirname18, isAbsolute as isAbsolute11, relative as relative8, resolve as resolve24 } from "node:path";
 function isInsideRoot(rootDir, candidate) {
   const rel = relative8(rootDir, candidate);
   return rel === "" || !rel.startsWith("..") && !isAbsolute11(rel);
@@ -126480,7 +127195,7 @@ async function copyConfiguredWorktreeFiles(options) {
       continue;
     }
     try {
-      await mkdir13(dirname17(destinationPath), { recursive: true });
+      await mkdir13(dirname18(destinationPath), { recursive: true });
       await copyFile2(sourcePath, destinationPath);
       const result = { path: trimmed, sourcePath, destinationPath, outcome: "copied" };
       logger3?.log?.(`${taskId ?? "worktree"}: copied configured worktree file ${trimmed}`);
@@ -132327,7 +133042,7 @@ import {
   rmSync as rmSync4,
   writeFileSync as writeFileSync3
 } from "node:fs";
-import { dirname as dirname18 } from "node:path";
+import { dirname as dirname19 } from "node:path";
 function sanitizeState(parsed) {
   if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
     return {};
@@ -132420,7 +133135,7 @@ var init_oauth_alert_state = __esm({
       }
       writeState(state) {
         const sanitized = sanitizeState(state);
-        const dir = dirname18(this.statePath);
+        const dir = dirname19(this.statePath);
         this.fs.mkdirSync(dir, { recursive: true });
         const tempPath = `${this.statePath}.${process.pid}.${this.clock()}.tmp`;
         const body = `${JSON.stringify(sanitized, null, 2)}
@@ -134940,7 +135655,7 @@ var init_agent_memory_index = __esm({
 // ../engine/src/agent-instructions.ts
 import { readFile as readFile20, writeFile as writeFile14, mkdir as mkdir16, access as access7 } from "node:fs/promises";
 import { constants as fsConstants3 } from "node:fs";
-import { isAbsolute as isAbsolute12, resolve as resolve26, relative as relative10, normalize as normalize7, sep as sep6, dirname as dirname19 } from "node:path";
+import { isAbsolute as isAbsolute12, resolve as resolve26, relative as relative10, normalize as normalize7, sep as sep6, dirname as dirname20 } from "node:path";
 function trimAndClamp(value, maxLength, label, agentId) {
   const trimmed = value.trim();
   if (!trimmed) {
@@ -135029,7 +135744,7 @@ async function ensureDefaultHeartbeatProcedureFile(rootDir, procedurePathRel, de
   } catch {
   }
   try {
-    await mkdir16(dirname19(filePath), { recursive: true });
+    await mkdir16(dirname20(filePath), { recursive: true });
     await writeFile14(filePath, defaultContent, "utf-8");
     log17.log(`Seeded default heartbeat procedure file at ${filePath}`);
     return filePath;
@@ -140211,7 +140926,7 @@ var init_bubblewrap_detect = __esm({
 });
 
 // ../engine/src/sandbox/bubblewrap-policy.ts
-import { dirname as dirname20, resolve as resolve27 } from "node:path";
+import { dirname as dirname21, resolve as resolve27 } from "node:path";
 function shouldPassEnv(key) {
   return key === "PATH" || key === "HOME" || key === "USER" || key === "LANG" || key.startsWith("LC_") || key.startsWith("NODE_") || key.startsWith("npm_") || key.startsWith("PNPM_") || key === "CI" || key.startsWith("FUSION_");
 }
@@ -140250,7 +140965,7 @@ function policyToBwrapArgs(policy, ctx) {
     if (!pathExists(path6)) continue;
     args.push("--bind", path6, path6);
   }
-  const nodeInstallDir = dirname20(ctx.nodeBinPath);
+  const nodeInstallDir = dirname21(ctx.nodeBinPath);
   const readonlyPaths = uniq([
     ...(policy.allowedReadPaths ?? []).length ? policy.allowedReadPaths ?? [] : [ctx.repoRootPath],
     ...ctx.repoRootPath !== ctx.worktreePath ? [ctx.repoRootPath] : [],
@@ -141014,7 +141729,7 @@ var init_sandbox_exec_profile_templates = __esm({
 });
 
 // ../engine/src/sandbox/sandbox-exec-policy.ts
-import { dirname as dirname21, resolve as resolve28 } from "node:path";
+import { dirname as dirname22, resolve as resolve28 } from "node:path";
 function uniq2(paths) {
   return [...new Set(paths.map((p2) => resolve28(p2)))];
 }
@@ -141054,7 +141769,7 @@ function policyToSbplProfile(policy, ctx) {
     throw new SandboxPolicyError2("Port 4040 is reserved and cannot be allowed in sandbox policy.");
   }
   const tmpDir = resolve28(ctx.tmpDirOverride ?? "/private/tmp");
-  const nodeDir = dirname21(ctx.nodeBinPath);
+  const nodeDir = dirname22(ctx.nodeBinPath);
   const writePaths = uniq2([ctx.worktreePath, ctx.pnpmStorePath, ...policy.allowedWritePaths ?? []]);
   ensureNoFusionWrites(writePaths, ctx.repoRootPath);
   const readPaths = uniq2([
@@ -141775,6 +142490,22 @@ function throwIfDependencySyncAborted(signal, taskId) {
   err.name = "AbortError";
   throw err;
 }
+function extractCommandErrorDetails(error2) {
+  const maybeCommandError = error2;
+  return String(maybeCommandError.stderr || maybeCommandError.stdout || maybeCommandError.message || error2);
+}
+function isOutdatedLockfileError(details) {
+  return /ERR_PNPM_OUTDATED_LOCKFILE|OUTDATED_LOCKFILE|frozen-lockfile|lockfile is frozen|lockfile had changes, but lockfile is frozen|lockfile needs to be updated|Your lockfile needs to be updated/i.test(
+    details
+  );
+}
+function buildNonFrozenRetryCommand(installCommand) {
+  if (!installCommand.includes("--frozen-lockfile")) return null;
+  if (/^\s*pnpm\b/.test(installCommand)) {
+    return installCommand.replace(/--frozen-lockfile/g, "--no-frozen-lockfile");
+  }
+  return installCommand.replace(/\s*--frozen-lockfile/g, "").trim();
+}
 async function installWorktreeDependencies(options) {
   const { cwd, settings, taskId, signal, log: log27, logger: logger3, context = "merge worktree dependency sync" } = options;
   const startedAt = Date.now();
@@ -141782,7 +142513,7 @@ async function installWorktreeDependencies(options) {
   const installCommand = getDependencySyncCommand(cwd, settings);
   const configured = configuredCommand !== null;
   if (!installCommand) {
-    return { installCommand: null, configured: false, skipped: true, skipReason: "no-command", durationMs: Date.now() - startedAt };
+    return { installCommand: null, configured: false, skipped: true, skipReason: "no-command", healed: false, durationMs: Date.now() - startedAt };
   }
   const shouldUseInstallMarker = !configured;
   const lockHash = shouldUseInstallMarker ? computeLockfileHash(cwd) : null;
@@ -141794,27 +142525,45 @@ async function installWorktreeDependencies(options) {
       configured,
       skipped: true,
       skipReason: "lockfile-marker-match",
+      healed: false,
       durationMs: Date.now() - startedAt
     };
   }
   throwIfDependencySyncAborted(signal, taskId);
   logger3?.log?.(`${taskId}: syncing dependencies ${context}`);
   await log27?.(`Syncing dependencies ${context}: ${installCommand}`);
+  const runInstall = (command) => execAsync21(command, {
+    cwd,
+    encoding: "utf-8",
+    maxBuffer: 10 * 1024 * 1024,
+    timeout: INSTALL_TIMEOUT_MS
+  });
   try {
-    await execAsync21(installCommand, {
-      cwd,
-      encoding: "utf-8",
-      maxBuffer: 10 * 1024 * 1024,
-      timeout: INSTALL_TIMEOUT_MS
-    });
+    await runInstall(installCommand);
     throwIfDependencySyncAborted(signal, taskId);
     if (lockHash) writeInstallMarker(cwd, lockHash);
-    return { installCommand, configured, skipped: false, durationMs: Date.now() - startedAt };
+    return { installCommand, configured, skipped: false, healed: false, durationMs: Date.now() - startedAt };
   } catch (error2) {
     throwIfDependencySyncAborted(signal, taskId);
-    const maybeCommandError = error2;
-    const details = maybeCommandError.stderr || maybeCommandError.stdout || maybeCommandError.message || String(error2);
-    throw new Error(`Dependency sync failed for ${taskId}: ${String(details)}`.trim());
+    const details = extractCommandErrorDetails(error2);
+    const retryCommand = configured ? null : buildNonFrozenRetryCommand(installCommand);
+    if (retryCommand && isOutdatedLockfileError(details)) {
+      logger3?.log?.(`${taskId}: lockfile out of date; retrying dependency sync without frozen lockfile`);
+      await log27?.(`Dependency sync hit an outdated lockfile; retrying without frozen lockfile: ${retryCommand}`);
+      try {
+        await runInstall(retryCommand);
+      } catch (retryError) {
+        throwIfDependencySyncAborted(signal, taskId);
+        throw new Error(
+          `Dependency sync failed for ${taskId} (after non-frozen retry): ${extractCommandErrorDetails(retryError)}`.trim()
+        );
+      }
+      throwIfDependencySyncAborted(signal, taskId);
+      const healedHash = computeLockfileHash(cwd);
+      if (healedHash) writeInstallMarker(cwd, healedHash);
+      return { installCommand, configured, skipped: false, healed: true, healedCommand: retryCommand, durationMs: Date.now() - startedAt };
+    }
+    throw new Error(`Dependency sync failed for ${taskId}: ${details}`.trim());
   }
 }
 var execAsync21, INSTALL_MARKER_RELPATH, LOCKFILE_CANDIDATES, INSTALL_TIMEOUT_MS;
@@ -143954,7 +144703,7 @@ var init_merger_ref_update_advance = __esm({
 import { execFile as execFile14, spawn as spawn7 } from "node:child_process";
 import { promisify as promisify36 } from "node:util";
 import { copyFileSync, existsSync as existsSync41, mkdirSync as mkdirSync10, mkdtempSync as mkdtempSync2, readFileSync as readFileSync15, rmSync as rmSync5, writeFileSync as writeFileSync5 } from "node:fs";
-import { dirname as dirname22, join as join45 } from "node:path";
+import { dirname as dirname23, join as join45 } from "node:path";
 import { tmpdir as tmpdir4 } from "node:os";
 async function runGit4(args, cwd, timeoutMs) {
   const result = await execFileAsync9("git", ["-c", "core.quotePath=false", ...args], {
@@ -144065,7 +144814,7 @@ async function syncWorktreeToHead(input) {
       const src = join45(worktreePath, rel);
       const dst = join45(untrackedDir, rel);
       try {
-        mkdirSync10(dirname22(dst), { recursive: true });
+        mkdirSync10(dirname23(dst), { recursive: true });
         copyFileSync(src, dst);
       } catch {
       }
@@ -144134,7 +144883,7 @@ async function syncWorktreeToHead(input) {
       }
       const dst = join45(worktreePath, rel);
       try {
-        mkdirSync10(dirname22(dst), { recursive: true });
+        mkdirSync10(dirname23(dst), { recursive: true });
         const data = readFileSync15(src);
         writeFileSync5(dst, data);
         restored.push(rel);
@@ -144484,7 +145233,7 @@ import * as childProcess3 from "node:child_process";
 import { promisify as promisify38 } from "node:util";
 import { existsSync as existsSync42, readFileSync as readFileSync16, readdirSync as readdirSync7, writeFileSync as writeFileSync6, unlinkSync as unlinkSync2, renameSync as renameSync5 } from "node:fs";
 import { createHash as createHash12 } from "node:crypto";
-import { join as join47, dirname as dirname23, basename as basename14 } from "node:path";
+import { join as join47, dirname as dirname24, basename as basename14 } from "node:path";
 import { hostname as hostname3 } from "node:os";
 import { Type as Type3 } from "typebox";
 function mergerCommitEnv() {
@@ -145075,7 +145824,7 @@ function deriveFileScopedPnpmTestCommand(rootDir, baseBranch, branch) {
       resolvedTests.add(file2);
       continue;
     }
-    const dir = dirname23(file2);
+    const dir = dirname24(file2);
     const stem = basename14(file2).replace(/\.(ts|tsx|js|jsx)$/, "");
     if (!stem) continue;
     const candidates = [
@@ -153327,8 +154076,8 @@ function optionalStepRevisionLogOutcome(details, key) {
   return `${details}
 ${OPTIONAL_STEP_REVISION_KEY_MARKER} ${key}`;
 }
-function extractTaskIdFromTempMergeDir(dirname30) {
-  const match = /^fusion-ai-merge-(fn-\d+)-[a-z0-9]+$/i.exec(dirname30);
+function extractTaskIdFromTempMergeDir(dirname31) {
+  const match = /^fusion-ai-merge-(fn-\d+)-[a-z0-9]+$/i.exec(dirname31);
   return match?.[1]?.toUpperCase() ?? null;
 }
 function resolveRepoLocalAiMergeRoot(rootDir, settings) {
@@ -164847,6 +165596,24 @@ You are ${assignedAgent.name}${assignedAgent.title?.trim() ? `, ${assignedAgent.
                 task.id,
                 errorMessage2
               );
+            } else if (err instanceof ModelFallbackExhaustedError) {
+              const failureMessage = `Triage failed: unable to select a usable model after ${err.attempts} attempt${err.attempts === 1 ? "" : "s"}. ${err.message}`;
+              planLog.error(`\u2717 ${task.id} planner model fallback exhausted: ${failureMessage}`);
+              await this.store.logEntry(task.id, failureMessage).catch((logErr) => {
+                const msg = logErr instanceof Error ? logErr.message : String(logErr);
+                planLog.warn(`${task.id}: failed to log planner fallback exhaustion: ${msg}`);
+              });
+              await this.store.updateTask(task.id, {
+                status: "failed",
+                error: failureMessage,
+                recoveryRetryCount: null,
+                nextRecoveryAt: null
+              }).catch((updateErr) => {
+                const msg = updateErr instanceof Error ? updateErr.message : String(updateErr);
+                planLog.warn(`${task.id}: failed to persist planner fallback exhaustion: ${msg}`);
+              });
+              this.options.onSpecifyError?.(task, err);
+              return;
             } else if (isTransientError(errorMessage2)) {
               const decision = computeRecoveryDecision({
                 recoveryRetryCount: task.recoveryRetryCount,
@@ -170241,7 +171008,7 @@ var init_task_session = __esm({
 // ../engine/src/pty-native.ts
 import * as fs6 from "node:fs";
 import { createRequire as createRequire6 } from "node:module";
-import { join as join53, dirname as dirname24 } from "node:path";
+import { join as join53, dirname as dirname25 } from "node:path";
 function getNativePrebuildName() {
   const platform4 = process.platform === "darwin" ? "darwin" : process.platform === "linux" ? "linux" : process.platform === "win32" ? "win32" : "unknown";
   const arch = process.arch === "arm64" ? "arm64" : process.arch === "x64" ? "x64" : "unknown";
@@ -170250,7 +171017,7 @@ function getNativePrebuildName() {
 function findInstalledNodePtyNativeDir() {
   try {
     const packageJsonPath = require3.resolve("node-pty/package.json");
-    const pkgRoot = dirname24(packageJsonPath);
+    const pkgRoot = dirname25(packageJsonPath);
     const releaseDir = join53(pkgRoot, "build", "Release");
     if (fs6.existsSync(join53(releaseDir, "pty.node"))) {
       return releaseDir;
@@ -170272,7 +171039,7 @@ function findStagedNativeDir() {
       return envPath;
     }
   }
-  const execDir = dirname24(process.execPath);
+  const execDir = dirname25(process.execPath);
   const nextToBinary = join53(execDir, "runtime", prebuildName);
   if (fs6.existsSync(join53(nextToBinary, "pty.node"))) {
     return nextToBinary;
@@ -172296,7 +173063,7 @@ import { delimiter, isAbsolute as isAbsolute16, join as join55, relative as rela
 import { existsSync as existsSync48, lstatSync as lstatSync2, realpathSync as realpathSync9 } from "node:fs";
 import { readFile as readFile24, rm as rm9, writeFile as writeFile19 } from "node:fs/promises";
 import { Type as Type6 } from "@earendil-works/pi-ai";
-import { ModelRegistry as ModelRegistry2, SessionManager as SessionManager2 } from "@earendil-works/pi-coding-agent";
+import { ModelRegistry as ModelRegistry3, SessionManager as SessionManager2 } from "@earendil-works/pi-coding-agent";
 function isAgentBrowserNotFoundError(error2) {
   const err = error2;
   const code = typeof err?.code === "string" || typeof err?.code === "number" ? String(err.code) : void 0;
@@ -174063,20 +174830,30 @@ The tool prevents your session from being killed by the inactivity watchdog duri
       /** Set of ephemeral spawned agent IDs with in-flight cleanup (prevents duplicate deletion attempts). */
       pendingEphemeralDeletions = /* @__PURE__ */ new Set();
       workspaceConfig = void 0;
+      /*
+      FNXC:WorkflowLifecycle 2026-07-01-16:20:
+      Breadcrumb task-log writes on the abort/pause/finalize paths are best-effort diagnostics and must NEVER break control flow. FN-7335 wired store.logEntry() straight into the SYNCHRONOUS markPausedAborted() as `void this.store.logEntry(...).catch(...)`; when store.logEntry is absent/throws synchronously (undefined method, store closed mid-abort, corrupted pager) the call throws a TypeError BEFORE the promise exists, so the trailing .catch() never runs and the exception unwinds out of markPausedAborted — aborting hard-cancel/pause and stranding the in-review handoff. Route every breadcrumb write through safeLogEntry() so both synchronous throws and async rejections are swallowed into a warn.
+      */
+      safeLogEntry(taskId, message) {
+        try {
+          const result = this.store.logEntry(taskId, message, void 0, this.getRunContextFor(taskId));
+          void Promise.resolve(result).catch((error2) => {
+            executorLog.warn(`${taskId}: failed to write task-log breadcrumb: ${error2 instanceof Error ? error2.message : String(error2)}`);
+          });
+        } catch (error2) {
+          executorLog.warn(`${taskId}: failed to write task-log breadcrumb: ${error2 instanceof Error ? error2.message : String(error2)}`);
+        }
+      }
       markPausedAborted(taskId, provenance = "hard-cancel", source = "unspecified") {
         const previousProvenance = this.pausedAbortProvenance.get(taskId);
         const alreadyMarked = this.pausedAborted.has(taskId);
         this.pausedAborted.add(taskId);
         this.pausedAbortProvenance.set(taskId, provenance);
         if (!alreadyMarked || previousProvenance !== provenance) {
-          void this.store.logEntry(
+          this.safeLogEntry(
             taskId,
-            `Pause abort marked: provenance=${provenance} source=${source}${previousProvenance && previousProvenance !== provenance ? ` previous=${previousProvenance}` : ""}`,
-            void 0,
-            this.getRunContextFor(taskId)
-          ).catch((error2) => {
-            executorLog.warn(`${taskId}: failed to log pause-abort marker: ${error2 instanceof Error ? error2.message : String(error2)}`);
-          });
+            `Pause abort marked: provenance=${provenance} source=${source}${previousProvenance && previousProvenance !== provenance ? ` previous=${previousProvenance}` : ""}`
+          );
         }
       }
       /**
@@ -174403,7 +175180,7 @@ The tool prevents your session from being killed by the inactivity watchdog duri
       get modelRegistry() {
         if (!this._modelRegistry) {
           const authStorage = createFusionAuthStorage();
-          this._modelRegistry = ModelRegistry2.create(authStorage, getModelRegistryModelsPath());
+          this._modelRegistry = ModelRegistry3.create(authStorage, getModelRegistryModelsPath());
           this._modelRegistry.refresh();
         }
         return this._modelRegistry;
@@ -174415,22 +175192,22 @@ The tool prevents your session from being killed by the inactivity watchdog duri
         return this._approvalRequestStore;
       }
       buildActionGateContext(taskId, agent, projectDefaultPolicy) {
-        if (!agent || isEphemeralAgent(agent)) {
-          return void 0;
-        }
-        const policy = resolveEffectiveAgentPermissionPolicy(agent.permissionPolicy, projectDefaultPolicy);
+        const actorId = agent?.id ?? `executor-${taskId ?? "unknown"}`;
+        const actorName = agent?.name ?? `Task worker ${taskId ?? "unknown"}`;
+        const isEphemeral = !agent || isEphemeralAgent(agent);
+        const policy = resolveEffectiveAgentPermissionPolicy(agent?.permissionPolicy, projectDefaultPolicy);
         return {
-          agentId: agent.id,
-          agentName: agent.name,
-          isEphemeral: false,
+          agentId: actorId,
+          agentName: actorName,
+          isEphemeral,
           taskId,
           runId: taskId ? this.getRunContextFor(taskId)?.runId : void 0,
           permissionPolicy: policy,
           createApprovalRequest: async (decision, args) => this.approvalRequestStore.create({
             requester: {
-              actorId: agent.id,
+              actorId,
               actorType: "agent",
-              actorName: agent.name
+              actorName
             },
             taskId,
             runId: taskId ? this.getRunContextFor(taskId)?.runId : void 0,
@@ -174449,16 +175226,16 @@ The tool prevents your session from being killed by the inactivity watchdog duri
             }
           }),
           findApprovalByDedupeKey: async (dedupeKey) => {
-            const latest = this.approvalRequestStore.findLatestByDedupeKey({ requesterActorId: agent.id, taskId, dedupeKey });
+            const latest = this.approvalRequestStore.findLatestByDedupeKey({ requesterActorId: actorId, taskId, dedupeKey });
             return latest ? { id: latest.id, status: latest.status } : null;
           },
           findPendingApprovalByDedupeKey: async (dedupeKey) => {
-            const latest = this.approvalRequestStore.findLatestByDedupeKey({ requesterActorId: agent.id, taskId, dedupeKey });
+            const latest = this.approvalRequestStore.findLatestByDedupeKey({ requesterActorId: actorId, taskId, dedupeKey });
             return latest?.status === "pending" ? { id: latest.id } : null;
           },
           pauseForApproval: async ({ approvalRequestId, decision }) => {
             if (taskId) {
-              await this.store.pauseTask(taskId, true, this.getRunContextFor(taskId), { pausedByAgentId: agent.id });
+              await this.store.pauseTask(taskId, true, this.getRunContextFor(taskId), { pausedByAgentId: actorId });
               await this.store.logEntry(
                 taskId,
                 `Approval required for ${decision.toolName}. Request ${approvalRequestId} created; task and agent paused awaiting decision.`,
@@ -174466,55 +175243,54 @@ The tool prevents your session from being killed by the inactivity watchdog duri
                 this.getRunContextFor(taskId)
               );
             }
-            if (this.options.agentStore) {
+            if (agent && this.options.agentStore) {
               await this.options.agentStore.updateAgentState(agent.id, "paused");
               await this.options.agentStore.updateAgent(agent.id, { pauseReason: "awaiting-approval" });
             }
           },
           markApprovalCompleted: async (approvalRequestId) => {
             await this.approvalRequestStore.markCompleted(approvalRequestId, {
-              actor: { actorId: agent.id, actorType: "agent", actorName: agent.name },
+              actor: { actorId, actorType: "agent", actorName },
               note: "Tool executed after approval"
             });
           }
         };
       }
       buildPermanentAgentGatingContext(taskId, agent, projectDefaultPolicy) {
-        if (!agent || isEphemeralAgent(agent)) {
-          return void 0;
-        }
+        const actorId = agent?.id ?? `executor-${taskId ?? "unknown"}`;
+        const actorName = agent?.name ?? `Task worker ${taskId ?? "unknown"}`;
         return {
-          permissionPolicy: resolveEffectiveAgentPermissionPolicy(agent.permissionPolicy, projectDefaultPolicy),
+          permissionPolicy: resolveEffectiveAgentPermissionPolicy(agent?.permissionPolicy, projectDefaultPolicy),
           requester: {
-            actorId: agent.id,
+            actorId,
             actorType: "agent",
-            actorName: agent.name
+            actorName
           },
           taskId,
           runId: taskId ? this.getRunContextFor(taskId)?.runId : void 0,
           createApprovalRequest: async ({ category, toolName, args }) => this.approvalRequestStore.create({
             requester: {
-              actorId: agent.id,
+              actorId,
               actorType: "agent",
-              actorName: agent.name
+              actorName
             },
             taskId,
             runId: taskId ? this.getRunContextFor(taskId)?.runId : void 0,
             targetAction: {
               category,
               action: toolName,
-              summary: `Permanent-agent gated action for ${toolName}`,
+              summary: `Agent gated action for ${toolName}`,
               resourceType: "tool",
               resourceId: toolName,
               context: {
                 toolName,
                 toolArgs: args,
-                source: "permanent-agent-gating"
+                source: "agent-gating"
               }
             }
           }),
           findPendingApprovalRequest: async (dedupeKey) => {
-            const pending = this.approvalRequestStore.list({ status: "pending", requesterActorId: agent.id, taskId, limit: 100 });
+            const pending = this.approvalRequestStore.list({ status: "pending", requesterActorId: actorId, taskId, limit: 100 });
             return pending.find((request2) => request2.targetAction.context?.approvalDedupeKey === dedupeKey) ?? null;
           }
         };
@@ -174763,14 +175539,10 @@ The tool prevents your session from being killed by the inactivity watchdog duri
         this.stuckAborted.delete(taskId);
         if (hadActiveSurface) {
           executorLog.log(`${taskId}: awaited abort of in-flight work \u2014 ${reason}`);
-          await this.store.logEntry(
+          this.safeLogEntry(
             taskId,
-            `Pause abort cleanup completed: reason=${reason}; surfaces=${abortedSurfaces.join(", ") || "none"}`,
-            void 0,
-            this.getRunContextFor(taskId)
-          ).catch((error2) => {
-            executorLog.warn(`${taskId}: failed to log pause-abort cleanup: ${error2 instanceof Error ? error2.message : String(error2)}`);
-          });
+            `Pause abort cleanup completed: reason=${reason}; surfaces=${abortedSurfaces.join(", ") || "none"}`
+          );
         }
       }
       async abortAllInFlight(reason) {
@@ -178511,11 +179283,9 @@ ${prompt}`;
           if (pausedAborted || live.paused || live.userPaused || abortProvenance) {
             const failedNodeForLog = result.visitedNodeIds[result.visitedNodeIds.length - 1] ?? "unknown";
             const failureValueForLog = this.graphFailureValue(result) ?? "none";
-            await this.store.logEntry(
+            this.safeLogEntry(
               task.id,
-              `Pause abort classified: provenance=${abortProvenance ?? "unknown"}; node=${failedNodeForLog}; interrupted=${result.interruptedNodeId ?? "none"}; abortKind=${result.interruptedAbortKind ?? "none"}; column=${live.column}; status=${live.status ?? "none"}; paused=${live.paused === true}; userPaused=${live.userPaused === true}; value=${failureValueForLog}; genuine=${genuinePauseAbort}; mergeSeam=${mergeSeamAborted}; completionSuppressed=${suppressFinalizedCompletionAbort}`,
-              void 0,
-              this.getRunContextFor(task.id)
+              `Pause abort classified: provenance=${abortProvenance ?? "unknown"}; node=${failedNodeForLog}; interrupted=${result.interruptedNodeId ?? "none"}; abortKind=${result.interruptedAbortKind ?? "none"}; column=${live.column}; status=${live.status ?? "none"}; paused=${live.paused === true}; userPaused=${live.userPaused === true}; value=${failureValueForLog}; genuine=${genuinePauseAbort}; mergeSeam=${mergeSeamAborted}; completionSuppressed=${suppressFinalizedCompletionAbort}`
             );
           }
           if (genuinePauseAbort && await this.isReentrantPausedAbortedInFlightNode(live, result, abortProvenance, pausedAborted, this.userCanceledTaskIds.has(task.id))) {
@@ -189152,6 +189922,10 @@ async function landOneRepo(repoRootDir, branch, integrationBranch, ctx) {
             configured: depsSyncResult.configured,
             skipped: depsSyncResult.skipped,
             skipReason: depsSyncResult.skipReason,
+            // FNXC:AIMerge 2026-07-02-14:05 (lockfile auto-heal): record when an outdated frozen lockfile
+            // was recovered by a non-frozen retry so operators can see deps drifted without failing merge.
+            healed: depsSyncResult.healed,
+            healedCommand: depsSyncResult.healedCommand,
             durationMs: depsSyncResult.durationMs
           }
         });
@@ -190089,7 +190863,30 @@ var init_workflow_authoritative_driver = __esm({
           },
           primitives: this.deps.executor.createAuthoritativeWorkflowPrimitives?.(settings) ?? primitivesFromLegacySeams(seams),
           seams,
+          /*
+          FNXC:WorkflowInterpreterCutover 2026-07-01-21:05:
+          BUILTIN_CODING_WORKFLOW_IR graduated to carry default-on/always-on custom
+          lifecycle nodes: the plan-review/code-review/browser-verification/post-merge
+          optional groups (bypassed at their group node when a task disables them via
+          enabledWorkflowSteps) and an ALWAYS-ON `completion-summary` prompt node
+          (kind:"prompt", summaryTarget:"task") that records the pre-review summary.
+          The transitional authoritative driver validates SEAM-LEVEL parity
+          (planning/execute/review/merge/schedule) against the legacy executor; it does
+          not reproduce custom-node side effects. Previously runCustomNode threw on any
+          custom node, so the always-on completion-summary aborted every clean run
+          before it could reach review→merge. Pass built-in auxiliary custom nodes
+          (task-summary nodes and bypassable optional groups) through as success so the
+          seam pipeline completes, mirroring the main executor's completion path for
+          parity purposes. Genuinely unexpected custom nodes still fail loudly.
+          */
           runCustomNode: async (node) => {
+            const isBuiltinAuxiliaryNode = node.config?.summaryTarget === "task" || node.kind === "optional-group";
+            if (isBuiltinAuxiliaryNode) {
+              executorLog.log(
+                `[workflow-authoritative] ${task.id}: passing auxiliary custom node '${node.id}' through as success (seam-parity run)`
+              );
+              return { outcome: "success" };
+            }
             throw new Error(`unexpected custom node in builtin authoritative workflow: ${node.id}`);
           },
           onEvent: (event) => {
@@ -192512,14 +193309,11 @@ Critical: a heartbeat without observable progress (or an explicit no-op reason)
         return this.approvalRequestStore;
       }
       buildActionGateContext(agent, taskId, runId, projectDefaultPolicy) {
-        if (isEphemeralAgent(agent)) {
-          return void 0;
-        }
         const policy = resolveEffectiveAgentPermissionPolicy(agent.permissionPolicy, projectDefaultPolicy);
         return {
           agentId: agent.id,
           agentName: agent.name,
-          isEphemeral: false,
+          isEphemeral: isEphemeralAgent(agent),
           taskId,
           runId,
           permissionPolicy: policy,
@@ -192564,9 +193358,6 @@ Critical: a heartbeat without observable progress (or an explicit no-op reason)
         };
       }
       buildPermanentAgentGatingContext(agent, taskId, runId, projectDefaultPolicy) {
-        if (isEphemeralAgent(agent)) {
-          return void 0;
-        }
         return {
           permissionPolicy: resolveEffectiveAgentPermissionPolicy(agent.permissionPolicy, projectDefaultPolicy),
           requester: { actorId: agent.id, actorType: "agent", actorName: agent.name },
@@ -192579,13 +193370,13 @@ Critical: a heartbeat without observable progress (or an explicit no-op reason)
             targetAction: {
               category,
               action: toolName,
-              summary: `Permanent-agent gated action for ${toolName}`,
+              summary: `Agent gated action for ${toolName}`,
               resourceType: "tool",
               resourceId: toolName,
               context: {
                 toolName,
                 toolArgs: args,
-                source: "permanent-agent-gating"
+                source: "agent-gating"
               }
             }
           }),
@@ -203987,7 +204778,7 @@ __export(child_process_runtime_exports, {
 import { EventEmitter as EventEmitter23 } from "node:events";
 import { fork } from "node:child_process";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
-import { dirname as dirname25, join as join58 } from "node:path";
+import { dirname as dirname26, join as join58 } from "node:path";
 var HealthMonitor, ChildProcessRuntime;
 var init_child_process_runtime = __esm({
   "../engine/src/runtimes/child-process-runtime.ts"() {
@@ -204147,7 +204938,7 @@ var init_child_process_runtime = __esm({
        */
       getWorkerPath() {
         const isCompiled = !import.meta.url.endsWith(".ts");
-        const currentDir = dirname25(fileURLToPath3(import.meta.url));
+        const currentDir = dirname26(fileURLToPath3(import.meta.url));
         const workerFile = isCompiled ? "child-process-worker.js" : "child-process-worker.ts";
         return join58(currentDir, workerFile);
       }
@@ -212450,6 +213241,7 @@ __export(src_exports2, {
   createDefaultNodeHandlers: () => createDefaultNodeHandlers,
   createFnAgent: () => createFnAgent2,
   createFusionAuthStorage: () => createFusionAuthStorage,
+  createFusionModelRegistry: () => createFusionModelRegistry,
   createInteractiveAiSessionWith: () => createInteractiveAiSessionWith,
   createLogger: () => createLogger2,
   createNoopLegacySeams: () => createNoopLegacySeams,
@@ -213139,6 +213931,13 @@ var init_planning_board_tools = __esm({
 // ../dashboard/src/planning.ts
 import { randomUUID as randomUUID23 } from "node:crypto";
 import { EventEmitter as EventEmitter28 } from "node:events";
+async function resolvePlanningMcpServers(store) {
+  const resolved = await resolveMcpServersForStore(store);
+  if (!resolved || !Array.isArray(resolved.servers)) {
+    return [];
+  }
+  return resolved.servers;
+}
 function ensureEngineReady() {
   return Promise.resolve();
 }
@@ -213207,6 +214006,68 @@ function normalizePlanningSummaryPayload(summaryInput, fallback) {
     keyDeliverables: normalizeStringArray(summary.keyDeliverables)
   };
 }
+function slugifyCheckpointTheme(label) {
+  return label.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 48) || "topic";
+}
+function collectCheckpointThemeText(history, summary) {
+  return [
+    summary.title,
+    summary.description,
+    summary.keyDeliverables.join("\n"),
+    summary.suggestedDependencies.join("\n"),
+    ...history.flatMap((entry) => [
+      entry.question.question,
+      entry.question.description ?? "",
+      JSON.stringify(entry.response)
+    ])
+  ].join("\n");
+}
+function buildDeepeningCheckpointOptions(history, summary) {
+  const text = collectCheckpointThemeText(history, summary);
+  const matched = CHECKPOINT_THEME_CANDIDATES.filter(
+    (candidate) => candidate.patterns.some((pattern) => pattern.test(text))
+  );
+  const selected = matched.length > 0 ? matched : CHECKPOINT_THEME_CANDIDATES.filter((candidate) => FALLBACK_CHECKPOINT_THEME_OPTIONS.includes(candidate.id));
+  const seen = /* @__PURE__ */ new Set();
+  const options = selected.flatMap((candidate) => {
+    const id = `theme-${slugifyCheckpointTheme(candidate.id)}`;
+    if (seen.has(id) || candidate.label === "Proceed to final plan") {
+      return [];
+    }
+    seen.add(id);
+    return [{ id, label: candidate.label, description: candidate.description }];
+  });
+  return [
+    { id: PLANNING_DEEPEN_PROCEED_OPTION_ID, label: "Proceed to final plan", description: "The plan is detailed enough; show the final editable summary." },
+    ...options
+  ];
+}
+function buildDeepeningCheckpointQuestion(history, summary) {
+  return {
+    id: PLANNING_DEEPEN_CHECKPOINT_ID,
+    type: "multi_select",
+    question: PLANNING_DEEPEN_CHECKPOINT_QUESTION,
+    description: "Select any areas you want to explore further, write an unlisted topic, or proceed to the final plan.",
+    options: buildDeepeningCheckpointOptions(history, summary)
+  };
+}
+function classifyDeepeningCheckpointResponse(question, responses) {
+  const rawSelected = responses[question.id];
+  const selectedIds = Array.isArray(rawSelected) ? rawSelected.filter((id) => typeof id === "string") : [];
+  const customTopic = typeof responses._other === "string" && responses._other.trim().length > 0 ? responses._other.trim() : void 0;
+  const proceed = responses[PLANNING_DEEPEN_PROCEED_RESPONSE_KEY] === true || selectedIds.includes(PLANNING_DEEPEN_PROCEED_OPTION_ID);
+  const themeIds = selectedIds.filter((id) => id !== PLANNING_DEEPEN_PROCEED_OPTION_ID);
+  const selectedThemeLabels = themeIds.map((id) => question.options?.find((option) => option.id === id)?.label || id);
+  return {
+    proceed,
+    selectedThemeIds: themeIds,
+    selectedThemeLabels,
+    ...customTopic ? { customTopic } : {}
+  };
+}
+function isDeepeningCheckpointQuestion(question) {
+  return question?.id === PLANNING_DEEPEN_CHECKPOINT_ID && question.question === PLANNING_DEEPEN_CHECKPOINT_QUESTION;
+}
 function safeParseJson(text, fallback, options) {
   if (!text) {
     return fallback;
@@ -213260,7 +214121,8 @@ function persistSession(session, status, error2) {
       initialPlan: session.initialPlan,
       ...session.draftModelProvider ? { modelProvider: session.draftModelProvider } : {},
       ...session.draftModelId ? { modelId: session.draftModelId } : {},
-      ...session.draftSummarizedFor ? { summarizedFor: session.draftSummarizedFor } : {}
+      ...session.draftSummarizedFor ? { summarizedFor: session.draftSummarizedFor } : {},
+      ...session.pendingSummary ? { pendingSummary: session.pendingSummary } : {}
     }),
     conversationHistory: JSON.stringify(session.history),
     currentQuestion: session.currentQuestion ? JSON.stringify(session.currentQuestion) : null,
@@ -213317,6 +214179,7 @@ function buildSessionFromRow(row) {
       }),
       { title: row.title, description: row.title }
     ) : void 0,
+    pendingSummary: payload.pendingSummary ? normalizePlanningSummaryPayload(payload.pendingSummary, { title: row.title, description: row.title }) : void 0,
     thinkingOutput: row.thinkingOutput,
     lastGeneratedThinking: row.thinkingOutput || "",
     error: row.error ?? void 0,
@@ -213424,7 +214287,7 @@ ${depthPromptSuffix}` : baseSystemPrompt;
     builtinToolsAllowlist: [...PLANNING_BUILTIN_WEB_TOOLS],
     // FNXC:McpConfig 2026-06-25-22:31: Planning/chat session creation resolves trusted MCP servers through the dashboard-scoped store and forwards only the materialized in-memory set to the engine runtime guard.
     // FNXC:McpConfig 2026-06-29-00:00: Planning sessions are intentionally read-only but still need configured MCP documentation/context tools; opt in at the session boundary while preserving engine-side namespacing, filtering, wrappers, and disposal.
-    mcpServers: (await resolveMcpServersForStore(store)).servers,
+    mcpServers: await resolvePlanningMcpServers(store),
     allowMcpToolsInReadonly: true,
     customTools: [
       ...createPlanningBoardTools(store),
@@ -213537,14 +214400,7 @@ async function getFirstQuestionFromAgent(session, message) {
       title: session.title || session.initialPlan,
       description: session.initialPlan
     });
-    session.summary = summary;
-    persistSession(session, "complete");
-    return {
-      id: "q-direct-summary",
-      type: "confirm",
-      question: `The AI has generated a plan: "${summary.title}". Proceed with this?`,
-      description: summary.description
-    };
+    return setPendingSummaryCheckpoint(session, summary);
   }
   return parsed.data;
 }
@@ -213564,7 +214420,7 @@ ${depthPromptSuffix}` : baseSystemPrompt;
     builtinToolsAllowlist: [...PLANNING_BUILTIN_WEB_TOOLS],
     // FNXC:McpConfig 2026-06-25-22:31: Streaming planning uses the same dashboard-scoped MCP resolution seam as non-streaming planning so no planning lane silently drops enabled servers.
     // FNXC:McpConfig 2026-06-29-00:00: Streaming planning uses the explicit read-only MCP opt-in; non-planning read-only lanes remain denied unless they set the same reviewed policy flag.
-    mcpServers: (await resolveMcpServersForStore(store)).servers,
+    mcpServers: await resolvePlanningMcpServers(store),
     allowMcpToolsInReadonly: true,
     customTools: [
       ...createPlanningBoardTools(store),
@@ -213770,6 +214626,54 @@ async function runGenerationWithTimeout(session, operation) {
     }
   }
 }
+function finalizePendingSummary(session) {
+  const summary = normalizePlanningSummaryPayload(session.pendingSummary ?? session.summary, {
+    title: session.title || session.initialPlan,
+    description: session.initialPlan
+  });
+  session.summary = summary;
+  session.pendingSummary = void 0;
+  session.currentQuestion = void 0;
+  session.error = void 0;
+  session.updatedAt = /* @__PURE__ */ new Date();
+  persistSession(session, "complete");
+  planningStreamManager.broadcast(session.id, {
+    type: "summary",
+    data: summary
+  });
+  planningStreamManager.broadcast(session.id, { type: "complete" });
+  return summary;
+}
+function setPendingSummaryCheckpoint(session, summary) {
+  const checkpoint = buildDeepeningCheckpointQuestion(session.history, summary);
+  session.pendingSummary = summary;
+  session.summary = void 0;
+  session.currentQuestion = checkpoint;
+  session.error = void 0;
+  session.lastGeneratedThinking = session.thinkingOutput;
+  session.updatedAt = /* @__PURE__ */ new Date();
+  persistSession(session, "awaiting_input");
+  void maybeNotifyPlanningAwaitingInput(session, checkpoint);
+  planningStreamManager.broadcast(session.id, {
+    type: "question",
+    data: checkpoint
+  });
+  return checkpoint;
+}
+function formatDeepeningRequestForAgent(decision, pendingSummary) {
+  const requestedTopics = [
+    ...decision.selectedThemeLabels,
+    ...decision.customTopic ? [decision.customTopic] : []
+  ];
+  return [
+    "The user chose to go deeper before accepting the final planning summary.",
+    "Continue the planning interview and explore these specific topics in more detail before producing another completion summary:",
+    requestedTopics.map((topic) => `- ${topic}`).join("\n"),
+    "Do not skip directly to the final summary unless the additional details are addressed; when you next complete, return the normal JSON complete payload.",
+    "Pending summary that was withheld from the user:",
+    JSON.stringify(pendingSummary)
+  ].join("\n\n");
+}
 async function continueAgentConversation(session, message) {
   if (!session.agent) {
     throw new InvalidSessionStateError("AI agent not initialized");
@@ -213862,6 +214766,7 @@ async function continueAgentConversation(session, message) {
       if (parsed.type === "question") {
         session.currentQuestion = parsed.data;
         session.summary = void 0;
+        session.pendingSummary = void 0;
         session.error = void 0;
         session.lastGeneratedThinking = session.thinkingOutput;
         session.updatedAt = /* @__PURE__ */ new Date();
@@ -213876,16 +214781,7 @@ async function continueAgentConversation(session, message) {
           title: session.title || session.initialPlan,
           description: session.initialPlan
         });
-        session.summary = summary;
-        session.currentQuestion = void 0;
-        session.error = void 0;
-        session.updatedAt = /* @__PURE__ */ new Date();
-        persistSession(session, "complete");
-        planningStreamManager.broadcast(session.id, {
-          type: "summary",
-          data: summary
-        });
-        planningStreamManager.broadcast(session.id, { type: "complete" });
+        setPendingSummaryCheckpoint(session, summary);
       }
     });
   } catch (err) {
@@ -214091,6 +214987,7 @@ async function submitResponse(sessionId, responses, rootDir, promptOverrides, st
       throw new InvalidSessionStateError("No active question in session");
     }
     session.error = void 0;
+    session.pendingSummary = void 0;
     persistSession(session, "generating");
     await ensureSessionAgent(session, rootDir, session.history, promptOverrides, store);
     const refineMessage = formatRefineRequestForAgent(session.summary);
@@ -214104,12 +215001,35 @@ async function submitResponse(sessionId, responses, rootDir, promptOverrides, st
     };
     session.error = void 0;
     session.history.push(historyEntry);
-    persistSession(session, "generating");
-    if (!session.agent) {
-      await ensureSessionAgent(session, rootDir, session.history.slice(0, -1), promptOverrides, store);
+    if (isDeepeningCheckpointQuestion(currentQuestion)) {
+      const pendingSummary = session.pendingSummary;
+      if (!pendingSummary) {
+        throw new InvalidSessionStateError("Planning checkpoint is missing its pending summary");
+      }
+      const decision = classifyDeepeningCheckpointResponse(currentQuestion, responses);
+      if (decision.proceed) {
+        finalizePendingSummary(session);
+      } else {
+        const hasDeepeningTopic = decision.selectedThemeLabels.length > 0 || Boolean(decision.customTopic);
+        if (!hasDeepeningTopic) {
+          session.history.pop();
+          throw new InvalidSessionStateError("Select a topic to explore or proceed to the final plan");
+        }
+        session.pendingSummary = void 0;
+        persistSession(session, "generating");
+        if (!session.agent) {
+          await ensureSessionAgent(session, rootDir, session.history.slice(0, -1), promptOverrides, store);
+        }
+        await continueAgentConversation(session, formatDeepeningRequestForAgent(decision, pendingSummary));
+      }
+    } else {
+      persistSession(session, "generating");
+      if (!session.agent) {
+        await ensureSessionAgent(session, rootDir, session.history.slice(0, -1), promptOverrides, store);
+      }
+      const message = formatResponseForAgent(currentQuestion, responses);
+      await continueAgentConversation(session, message);
     }
-    const message = formatResponseForAgent(currentQuestion, responses);
-    await continueAgentConversation(session, message);
   }
   if (session.summary) {
     return { type: "complete", data: session.summary };
@@ -214266,7 +215186,7 @@ function getSession(sessionId) {
     return void 0;
   }
 }
-var PLANNING_NO_AMBIENT_TASK_ID, PLANNING_BUILTIN_WEB_TOOLS, createFnAgent4, planningNtfyHelpers, diagnostics2, PLANNING_SYSTEM_PROMPT, SESSION_TTL_MS, CLEANUP_INTERVAL_MS2, MAX_SESSIONS_PER_IP_PER_HOUR, RATE_LIMIT_WINDOW_MS2, GENERATION_TIMEOUT_MS, GENERATION_LOOP_REPEAT_LIMIT, PLANNING_STUCK_ERROR_MESSAGE, PLANNING_LOOP_ERROR_MESSAGE, PLANNING_USER_STOP_ERROR_MESSAGE, PLANNING_DEPTH_PROMPT_SUFFIX, sessions, rateLimits2, activeGenerations, _aiSessionStore, cleanupInterval2, PlanningStreamManager, planningStreamManager, MAX_PARSE_RETRIES2, RateLimitError2, SessionNotFoundError, InvalidSessionStateError, GenerationInProgressError;
+var PLANNING_NO_AMBIENT_TASK_ID, PLANNING_BUILTIN_WEB_TOOLS, createFnAgent4, planningNtfyHelpers, diagnostics2, PLANNING_SYSTEM_PROMPT, SESSION_TTL_MS, CLEANUP_INTERVAL_MS2, MAX_SESSIONS_PER_IP_PER_HOUR, RATE_LIMIT_WINDOW_MS2, GENERATION_TIMEOUT_MS, GENERATION_LOOP_REPEAT_LIMIT, PLANNING_STUCK_ERROR_MESSAGE, PLANNING_LOOP_ERROR_MESSAGE, PLANNING_USER_STOP_ERROR_MESSAGE, PLANNING_DEPTH_PROMPT_SUFFIX, sessions, rateLimits2, activeGenerations, _aiSessionStore, CHECKPOINT_THEME_CANDIDATES, FALLBACK_CHECKPOINT_THEME_OPTIONS, cleanupInterval2, PlanningStreamManager, planningStreamManager, MAX_PARSE_RETRIES2, RateLimitError2, SessionNotFoundError, InvalidSessionStateError, GenerationInProgressError;
 var init_planning = __esm({
   "../dashboard/src/planning.ts"() {
     "use strict";
@@ -214360,6 +215280,15 @@ For completion:
     sessions = /* @__PURE__ */ new Map();
     rateLimits2 = /* @__PURE__ */ new Map();
     activeGenerations = /* @__PURE__ */ new Map();
+    CHECKPOINT_THEME_CANDIDATES = [
+      { id: "scope", label: "Scope and non-goals", description: "Clarify boundaries, trade-offs, and what should stay out of this task.", patterns: [/\bscope\b/i, /non[- ]?goal/i, /boundary/i, /trade[- ]?off/i] },
+      { id: "edge-cases", label: "Edge cases and data states", description: "Explore empty, duplicate, malformed, missing, or unusual states before implementation.", patterns: [/edge case/i, /empty/i, /undefined/i, /duplicate/i, /malformed/i, /data state/i] },
+      { id: "ux", label: "UX and interaction details", description: "Tighten user-facing copy, responsive behavior, accessibility, and interaction flow.", patterns: [/\bux\b/i, /user/i, /mobile/i, /responsive/i, /accessibility/i, /keyboard/i, /button/i] },
+      { id: "dependencies", label: "Dependencies and integrations", description: "Identify prerequisite tasks, third-party systems, and integration constraints.", patterns: [/dependenc/i, /integration/i, /api\b/i, /external/i, /provider/i, /service/i] },
+      { id: "testing", label: "Testing and verification", description: "Deepen acceptance criteria, regression coverage, and validation commands.", patterns: [/test/i, /verify/i, /validation/i, /acceptance/i, /regression/i] },
+      { id: "rollout", label: "Rollout and operations", description: "Discuss migration, release, observability, documentation, or support considerations.", patterns: [/rollout/i, /migration/i, /release/i, /observability/i, /docs?\b/i, /operator/i] }
+    ];
+    FALLBACK_CHECKPOINT_THEME_OPTIONS = ["scope", "edge-cases", "ux", "testing"];
     cleanupInterval2 = setInterval(cleanupExpiredSessions, CLEANUP_INTERVAL_MS2);
     cleanupInterval2.unref?.();
     registerBeforeExitCleanup(() => {
@@ -215229,7 +216158,7 @@ import {
   unlinkSync as unlinkSync3
 } from "node:fs";
 import { homedir as homedir8 } from "node:os";
-import { basename as basename16, dirname as dirname26, join as join60, resolve as resolve31 } from "node:path";
+import { basename as basename16, dirname as dirname27, join as join60, resolve as resolve31 } from "node:path";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 function resolveHermesHome(profile) {
   const base = process.env.HERMES_HOME ?? join60(homedir8(), ".hermes");
@@ -215238,7 +216167,7 @@ function resolveHermesHome(profile) {
 }
 function getFusionSkillSourceCandidates(moduleUrl = import.meta.url) {
   const here = fileURLToPath4(moduleUrl);
-  const moduleDir = dirname26(here);
+  const moduleDir = dirname27(here);
   return [
     resolve31(moduleDir, "..", "..", "..", "..", "packages", "cli", "skill", FUSION_SKILL_NAME),
     resolve31(moduleDir, "..", "..", "..", "skill", FUSION_SKILL_NAME),
@@ -215265,16 +216194,16 @@ function installFusionSkillIntoHermesHome(options = {}) {
     };
   }
   try {
-    mkdirSync14(dirname26(targetDir), { recursive: true });
+    mkdirSync14(dirname27(targetDir), { recursive: true });
     let replaced = false;
     if (existsSync51(targetDir) || isBrokenSymlink(targetDir)) {
       const stat12 = lstatSync3(targetDir);
       if (stat12.isSymbolicLink()) {
         const currentTarget = safeReadlink(targetDir);
-        if (currentTarget && resolve31(dirname26(targetDir), currentTarget) === resolve31(sourceDir)) {
+        if (currentTarget && resolve31(dirname27(targetDir), currentTarget) === resolve31(sourceDir)) {
           return { outcome: "already-installed", sourceDir, targetDir };
         }
-        if (!looksLikeFusionSkillTarget(resolve31(dirname26(targetDir), currentTarget ?? ""))) {
+        if (!looksLikeFusionSkillTarget(resolve31(dirname27(targetDir), currentTarget ?? ""))) {
           return {
             outcome: "skipped",
             sourceDir,
@@ -215741,7 +216670,7 @@ import { writeFileSync as writeFileSync10 } from "node:fs";
 import { tmpdir as tmpdir10 } from "node:os";
 import { join as join61 } from "node:path";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
-import { dirname as dirname27 } from "node:path";
+import { dirname as dirname28 } from "node:path";
 function toolsToMcpToolDefs(tools) {
   if (!Array.isArray(tools)) return [];
   return tools.filter((tool) => tool && typeof tool.name === "string" && !BUILT_IN_TOOL_NAMES.has(tool.name)).map((tool) => ({
@@ -215755,7 +216684,7 @@ function writeOpenClawMcpBridgeFiles(toolDefs, cacheKey) {
   const schemaPath = join61(tmpdir10(), `openclaw-runtime-mcp-schemas-${suffix}.json`);
   writeFileSync10(schemaPath, JSON.stringify(toolDefs));
   const __filename = fileURLToPath5(import.meta.url);
-  const __dirname2 = dirname27(__filename);
+  const __dirname2 = dirname28(__filename);
   const serverPath = join61(__dirname2, "mcp-schema-server.cjs");
   const serverConfig = {
     command: "node",
@@ -219575,6 +220504,430 @@ var init_github_source_issue_close = __esm({
   }
 });
 
+// ../dashboard/src/gitlab.ts
+function clampLimit(limit) {
+  if (typeof limit !== "number" || !Number.isFinite(limit)) return DEFAULT_LIMIT3;
+  return Math.max(1, Math.min(MAX_LIMIT, Math.floor(limit)));
+}
+function encodeGitLabPathId(id) {
+  return encodeURIComponent(String(id).trim());
+}
+function appendListParams(params, options) {
+  const state = typeof options.state === "string" && options.state.trim() ? options.state.trim() : "opened";
+  params.set("state", state);
+  if (options.labels && options.labels.length > 0) {
+    params.set("labels", options.labels.map((label) => label.trim()).filter(Boolean).join(","));
+  }
+}
+function asRecord2(value) {
+  return value && typeof value === "object" ? value : {};
+}
+function normalizeAuthor(author) {
+  const raw = asRecord2(author);
+  if (Object.keys(raw).length === 0) return null;
+  return {
+    ...typeof raw.id === "number" ? { id: raw.id } : {},
+    ...typeof raw.username === "string" ? { username: raw.username } : {},
+    ...typeof raw.name === "string" ? { name: raw.name } : {},
+    ...typeof raw.avatar_url === "string" ? { avatarUrl: raw.avatar_url } : {},
+    ...typeof raw.web_url === "string" ? { webUrl: raw.web_url } : {}
+  };
+}
+function normalizeLabels(labels) {
+  return Array.isArray(labels) ? labels.filter((label) => typeof label === "string") : [];
+}
+function readProjectPath(input) {
+  const raw = asRecord2(input);
+  if (typeof raw.project_path_with_namespace === "string") return raw.project_path_with_namespace;
+  const references = asRecord2(raw.references);
+  if (typeof references.full === "string") {
+    const full = references.full;
+    const webUrl = typeof raw.web_url === "string" ? raw.web_url : "";
+    const marker = webUrl.includes("/-/merge_requests/") ? "!" : "#";
+    const idx = full.lastIndexOf(marker);
+    return idx > 0 ? full.slice(0, idx) : void 0;
+  }
+  if (typeof raw?.web_url === "string") {
+    const marker = raw.web_url.includes("/-/merge_requests/") ? "/-/merge_requests/" : "/-/issues/";
+    try {
+      const url2 = new URL(raw.web_url);
+      const idx = url2.pathname.indexOf(marker);
+      return idx > 0 ? decodeURIComponent(url2.pathname.slice(1, idx)) : void 0;
+    } catch {
+      return void 0;
+    }
+  }
+  return void 0;
+}
+function normalizeIssue(input, resourceKind, extras = {}) {
+  const raw = asRecord2(input);
+  return {
+    resourceKind,
+    ...typeof raw.id === "number" ? { id: raw.id } : {},
+    iid: Number(raw.iid),
+    ...typeof raw.project_id === "number" ? { projectId: raw.project_id } : {},
+    ...readProjectPath(raw) ? { projectPath: readProjectPath(raw) } : {},
+    title: String(raw.title ?? ""),
+    description: typeof raw.description === "string" ? raw.description : null,
+    webUrl: String(raw.web_url ?? ""),
+    state: String(raw.state ?? "unknown"),
+    author: normalizeAuthor(raw.author),
+    labels: normalizeLabels(raw.labels),
+    ...typeof raw.created_at === "string" ? { createdAt: raw.created_at } : {},
+    ...typeof raw.updated_at === "string" ? { updatedAt: raw.updated_at } : {},
+    ...typeof raw.closed_at === "string" ? { closedAt: raw.closed_at } : {},
+    ...typeof raw.user_notes_count === "number" ? { commentsCount: raw.user_notes_count } : {},
+    ...extras
+  };
+}
+function normalizeMergeRequest(input, extras = {}) {
+  const raw = asRecord2(input);
+  return {
+    resourceKind: "merge_request",
+    ...typeof raw.id === "number" ? { id: raw.id } : {},
+    iid: Number(raw.iid),
+    ...typeof raw.project_id === "number" ? { projectId: raw.project_id } : {},
+    ...readProjectPath(raw) ? { projectPath: readProjectPath(raw) } : {},
+    title: String(raw.title ?? ""),
+    description: typeof raw.description === "string" ? raw.description : null,
+    webUrl: String(raw.web_url ?? ""),
+    state: String(raw.state ?? "unknown"),
+    author: normalizeAuthor(raw.author),
+    labels: normalizeLabels(raw.labels),
+    ...typeof raw.created_at === "string" ? { createdAt: raw.created_at } : {},
+    ...typeof raw.updated_at === "string" ? { updatedAt: raw.updated_at } : {},
+    ...typeof raw.closed_at === "string" ? { closedAt: raw.closed_at } : {},
+    ...typeof raw.merged_at === "string" ? { mergedAt: raw.merged_at } : {},
+    ...typeof raw.user_notes_count === "number" ? { commentsCount: raw.user_notes_count } : {},
+    ...typeof raw.source_branch === "string" ? { sourceBranch: raw.source_branch } : {},
+    ...typeof raw.target_branch === "string" ? { targetBranch: raw.target_branch } : {},
+    ...typeof raw.draft === "boolean" ? { draft: raw.draft } : {},
+    ...extras
+  };
+}
+function mapGitLabError(status) {
+  switch (status) {
+    case 401:
+      return "GitLab authentication failed. Check gitlabAuthToken and required read_api scope.";
+    case 403:
+      return "GitLab authorization failed. Check token scope and project/group access.";
+    case 404:
+      return "GitLab project, group, issue, or merge request was not found.";
+    case 429:
+      return "GitLab rate limit exceeded. Try again later.";
+    default:
+      return status >= 500 ? "GitLab is unavailable. Try again later." : `GitLab API request failed with status ${status}.`;
+  }
+}
+function projectIdentity(item) {
+  return item.projectPath ?? (item.projectId !== void 0 ? String(item.projectId) : "unknown-project");
+}
+function buildGitLabTaskProvenance(args) {
+  const { auth: auth2, resourceType, item } = args;
+  const groupPathFromInput = typeof args.groupInput === "string" ? args.groupInput : void 0;
+  const groupIdFromInput = typeof args.groupInput === "number" ? args.groupInput : void 0;
+  const repository = projectIdentity(item);
+  const externalIssueId = resourceType === "merge_request" ? `gitlab:mr:${item.projectId ?? repository}:${item.id ?? item.iid}` : String(item.id ?? `${item.projectId ?? repository}:${item.iid}`);
+  const url2 = new URL(item.webUrl);
+  return {
+    sourceIssue: {
+      provider: "gitlab",
+      repository,
+      externalIssueId,
+      issueNumber: item.iid,
+      url: item.webUrl
+    },
+    gitlabTracking: {
+      item: {
+        kind: resourceType,
+        url: item.webUrl,
+        instanceUrl: auth2.webBaseUrl,
+        host: url2.host,
+        iid: item.iid,
+        ...typeof item.id === "number" ? { id: item.id } : {},
+        ...typeof item.projectId === "number" ? { projectId: item.projectId } : {},
+        ...typeof item.projectPath === "string" ? { projectPath: item.projectPath } : {},
+        ..."groupId" in item && item.groupId !== void 0 ? { groupId: item.groupId } : groupIdFromInput !== void 0 ? { groupId: groupIdFromInput } : {},
+        ..."groupPath" in item && item.groupPath !== void 0 ? { groupPath: item.groupPath } : groupPathFromInput !== void 0 ? { groupPath: groupPathFromInput } : {},
+        title: item.title,
+        state: item.state,
+        createdAt: item.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+        linkedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        ...item.updatedAt ? { lastSyncedAt: item.updatedAt } : {}
+      }
+    },
+    sourceMetadata: {
+      provider: "gitlab",
+      resourceType,
+      instanceUrl: auth2.webBaseUrl,
+      apiBaseUrl: auth2.apiBaseUrl,
+      projectId: item.projectId,
+      projectPath: item.projectPath,
+      groupId: "groupId" in item && item.groupId !== void 0 ? item.groupId : groupIdFromInput,
+      groupPath: "groupPath" in item && item.groupPath !== void 0 ? item.groupPath : groupPathFromInput,
+      projectInput: args.projectInput,
+      groupInput: args.groupInput,
+      iid: item.iid,
+      webUrl: item.webUrl,
+      ...resourceType === "merge_request" ? {
+        mergeRequestId: item.id,
+        mergeRequestIid: item.iid,
+        sourceBranch: item.sourceBranch,
+        targetBranch: item.targetBranch,
+        draft: item.draft
+      } : {
+        issueId: item.id,
+        issueIid: item.iid
+      }
+    }
+  };
+}
+function isGitLabAlreadyImported(task, provenance) {
+  const sourceUrl = provenance.sourceIssue.url;
+  if (sourceUrl && task.description?.includes(sourceUrl)) return true;
+  if (task.sourceIssue?.provider === "gitlab" && task.sourceIssue.externalIssueId === provenance.sourceIssue.externalIssueId) return true;
+  const metadata = task.source?.sourceMetadata;
+  if (task.source?.sourceType === "gitlab_import" && metadata && typeof metadata === "object") {
+    const meta3 = metadata;
+    return meta3.resourceType === provenance.sourceMetadata.resourceType && meta3.iid === provenance.sourceMetadata.iid && (meta3.projectId === provenance.sourceMetadata.projectId || meta3.projectPath === provenance.sourceMetadata.projectPath) && (meta3.webUrl === sourceUrl || sourceUrl === void 0);
+  }
+  return false;
+}
+function buildGitLabTaskDescription(item) {
+  const body = item.description?.trim() || "(no description)";
+  return `${body}
+
+Source: ${item.webUrl}`;
+}
+var GitLabApiError, DEFAULT_LIMIT3, MAX_LIMIT, PAGE_SIZE, GitLabClient;
+var init_gitlab = __esm({
+  "../dashboard/src/gitlab.ts"() {
+    "use strict";
+    GitLabApiError = class extends Error {
+      constructor(status, message) {
+        super(message);
+        this.status = status;
+        this.name = "GitLabApiError";
+      }
+    };
+    DEFAULT_LIMIT3 = 30;
+    MAX_LIMIT = 100;
+    PAGE_SIZE = 100;
+    GitLabClient = class {
+      constructor(auth2, fetchImpl = fetch) {
+        this.auth = auth2;
+        this.fetchImpl = fetchImpl;
+      }
+      async request(path6, init) {
+        const url2 = `${this.auth.apiBaseUrl.replace(/\/+$/u, "")}/${path6.replace(/^\/+/, "")}`;
+        const response = await this.fetchImpl(url2, {
+          ...init,
+          headers: {
+            Accept: "application/json",
+            [this.auth.headerName]: this.auth.token,
+            ...init?.body ? { "Content-Type": "application/json" } : {},
+            ...init?.headers ?? {}
+          }
+        });
+        if (!response.ok) {
+          throw new GitLabApiError(response.status, mapGitLabError(response.status));
+        }
+        if (response.status === 204) return void 0;
+        return await response.json();
+      }
+      async listPaginated(path6, options, normalize8) {
+        const limit = clampLimit(options.limit);
+        const out = [];
+        let page = 1;
+        while (out.length < limit && page <= Math.ceil(limit / PAGE_SIZE) + 1) {
+          const params = new URLSearchParams();
+          params.set("per_page", String(Math.min(PAGE_SIZE, limit - out.length)));
+          params.set("page", String(page));
+          appendListParams(params, options);
+          const rows = await this.request(`${path6}?${params.toString()}`);
+          if (!Array.isArray(rows) || rows.length === 0) break;
+          out.push(...rows.map(normalize8));
+          if (rows.length < Number(params.get("per_page"))) break;
+          page += 1;
+        }
+        return out.slice(0, limit);
+      }
+      listProjectIssues(project, options = {}) {
+        return this.listPaginated(`projects/${encodeGitLabPathId(project)}/issues`, options, (raw) => normalizeIssue(raw, "project_issue"));
+      }
+      listGroupIssues(group, options = {}) {
+        return this.listPaginated(`groups/${encodeGitLabPathId(group)}/issues`, options, (raw) => normalizeIssue(raw, "group_issue", {
+          groupPath: typeof group === "string" ? group : void 0,
+          groupId: typeof group === "number" ? group : void 0
+        }));
+      }
+      listMergeRequests(project, options = {}) {
+        return this.listPaginated(`projects/${encodeGitLabPathId(project)}/merge_requests`, options, normalizeMergeRequest);
+      }
+      async getProjectIssue(project, iid) {
+        return normalizeIssue(await this.request(`projects/${encodeGitLabPathId(project)}/issues/${iid}`), "project_issue");
+      }
+      async getMergeRequest(project, iid) {
+        return normalizeMergeRequest(await this.request(`projects/${encodeGitLabPathId(project)}/merge_requests/${iid}`));
+      }
+      /*
+      FNXC:GitLabLifecycle 2026-07-02-00:00:
+      GitLab lifecycle side effects must use REST notes and state_event APIs for GitLab.com and self-managed instances. Keep project identifiers URL-encoded, token auth header-based, and never introduce a local GitLab CLI dependency.
+      */
+      async commentOnProjectIssue(project, iid, body) {
+        await this.request(`projects/${encodeGitLabPathId(project)}/issues/${iid}/notes`, {
+          method: "POST",
+          body: JSON.stringify({ body })
+        });
+      }
+      async commentOnMergeRequest(project, iid, body) {
+        await this.request(`projects/${encodeGitLabPathId(project)}/merge_requests/${iid}/notes`, {
+          method: "POST",
+          body: JSON.stringify({ body })
+        });
+      }
+      async setProjectIssueState(project, iid, state) {
+        const params = new URLSearchParams({ state_event: state === "closed" ? "close" : "reopen" });
+        return normalizeIssue(await this.request(`projects/${encodeGitLabPathId(project)}/issues/${iid}?${params.toString()}`, { method: "PUT" }), "project_issue");
+      }
+      async setMergeRequestState(project, iid, state) {
+        const params = new URLSearchParams({ state_event: state === "closed" ? "close" : "reopen" });
+        return normalizeMergeRequest(await this.request(`projects/${encodeGitLabPathId(project)}/merge_requests/${iid}?${params.toString()}`, { method: "PUT" }));
+      }
+    };
+  }
+});
+
+// ../dashboard/src/gitlab-auth.ts
+function pickString2(source, key) {
+  const value = source?.[key];
+  return typeof value === "string" ? value : void 0;
+}
+function readConfiguredString2(value) {
+  if (typeof value !== "string") return void 0;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : void 0;
+}
+function normalizeTokenType(value) {
+  if (value === void 0 || value === null || value === "") return void 0;
+  if (typeof value !== "string") return "invalid";
+  const trimmed = value.trim();
+  if (trimmed === "") return void 0;
+  return GITLAB_AUTH_TOKEN_TYPES.includes(trimmed) ? trimmed : "invalid";
+}
+function firstConfiguredTokenType(...values) {
+  for (const value of values) {
+    const normalized = normalizeTokenType(value);
+    if (normalized !== void 0) return normalized;
+  }
+  return void 0;
+}
+function resolveGitlabAuth(deps = {}) {
+  if (!resolveGitlabEnabled({ project: deps.projectSettings ?? void 0, global: deps.globalSettings })) {
+    return { ok: false, reason: "disabled", message: "GitLab integration is disabled in Settings." };
+  }
+  let config2;
+  try {
+    config2 = resolveGitlabConfig({
+      project: deps.projectSettings ?? void 0,
+      global: deps.globalSettings
+    });
+  } catch (error2) {
+    return {
+      ok: false,
+      reason: "invalid_config",
+      message: error2 instanceof Error ? error2.message : "Invalid GitLab configuration."
+    };
+  }
+  const project = deps.projectSettings;
+  const global2 = deps.globalSettings;
+  const env = deps.env ?? process.env;
+  const token = readConfiguredString2(project?.gitlabAuthToken) ?? readConfiguredString2(global2?.gitlabAuthToken) ?? readConfiguredString2(pickString2(global2, "projectGitlabAuthToken")) ?? readConfiguredString2(env.GITLAB_TOKEN) ?? "";
+  const tokenType = firstConfiguredTokenType(
+    project?.gitlabAuthTokenType,
+    global2?.gitlabAuthTokenType,
+    pickString2(global2, "projectGitlabAuthTokenType")
+  );
+  if (tokenType === "invalid") {
+    return {
+      ok: false,
+      reason: "invalid_token_type",
+      message: 'Invalid gitlabAuthTokenType. Expected "personal", "project", or "group".'
+    };
+  }
+  if (!token) {
+    return {
+      ok: false,
+      reason: "token_missing",
+      message: "GitLab auth requires gitlabAuthToken or GITLAB_TOKEN."
+    };
+  }
+  return {
+    ok: true,
+    auth: {
+      apiBaseUrl: config2.apiBaseUrl,
+      webBaseUrl: config2.instanceUrl,
+      token,
+      tokenType: tokenType ?? "personal",
+      headerName: GITLAB_AUTH_HEADER_NAME
+    }
+  };
+}
+var GITLAB_AUTH_HEADER_NAME, GITLAB_AUTH_TOKEN_TYPES;
+var init_gitlab_auth = __esm({
+  "../dashboard/src/gitlab-auth.ts"() {
+    "use strict";
+    init_src();
+    GITLAB_AUTH_HEADER_NAME = "PRIVATE-TOKEN";
+    GITLAB_AUTH_TOKEN_TYPES = ["personal", "project", "group"];
+  }
+});
+
+// ../dashboard/src/gitlab-lifecycle.ts
+var init_gitlab_lifecycle = __esm({
+  "../dashboard/src/gitlab-lifecycle.ts"() {
+    "use strict";
+    init_gitlab();
+    init_gitlab_auth();
+  }
+});
+
+// ../dashboard/src/gitlab-issue-comment.ts
+var init_gitlab_issue_comment = __esm({
+  "../dashboard/src/gitlab-issue-comment.ts"() {
+    "use strict";
+    init_gitlab_lifecycle();
+  }
+});
+
+// ../dashboard/src/gitlab-tracking-comments.ts
+var init_gitlab_tracking_comments = __esm({
+  "../dashboard/src/gitlab-tracking-comments.ts"() {
+    "use strict";
+    init_gitlab_lifecycle();
+  }
+});
+
+// ../dashboard/src/gitlab-tracking-state.ts
+var init_gitlab_tracking_state = __esm({
+  "../dashboard/src/gitlab-tracking-state.ts"() {
+    "use strict";
+    init_gitlab();
+    init_gitlab_lifecycle();
+    init_github_tracking_state();
+  }
+});
+
+// ../dashboard/src/gitlab-source-issue-close.ts
+var init_gitlab_source_issue_close = __esm({
+  "../dashboard/src/gitlab-source-issue-close.ts"() {
+    "use strict";
+    init_gitlab_lifecycle();
+    init_gitlab_tracking_state();
+    init_github_tracking_state();
+  }
+});
+
 // ../dashboard/src/knowledge-index.ts
 var init_knowledge_index = __esm({
   "../dashboard/src/knowledge-index.ts"() {
@@ -220244,6 +221597,10 @@ var init_register_git_github = __esm({
     init_github_tracking_state();
     init_github_tracking_reconciler();
     init_github_source_issue_close();
+    init_gitlab_issue_comment();
+    init_gitlab_tracking_comments();
+    init_gitlab_tracking_state();
+    init_gitlab_source_issue_close();
     init_knowledge_index_refresh();
     init_github_poll();
     init_project_store_resolver();
@@ -225194,6 +226551,25 @@ var init_register_messaging_scripts = __esm({
   }
 });
 
+// ../dashboard/src/gitlab-source-issue-reconciler.ts
+var init_gitlab_source_issue_reconciler = __esm({
+  "../dashboard/src/gitlab-source-issue-reconciler.ts"() {
+    "use strict";
+    init_gitlab_lifecycle();
+  }
+});
+
+// ../dashboard/src/routes/register-gitlab.ts
+var init_register_gitlab = __esm({
+  "../dashboard/src/routes/register-gitlab.ts"() {
+    "use strict";
+    init_api_error();
+    init_gitlab_auth();
+    init_gitlab();
+    init_gitlab_source_issue_reconciler();
+  }
+});
+
 // ../dashboard/src/terminal.ts
 import { spawn as spawn14 } from "node:child_process";
 import { randomUUID as randomUUID26 } from "node:crypto";
@@ -225667,7 +227043,7 @@ var init_register_secrets_sync_inbound_routes = __esm({
 });
 
 // ../dashboard/src/routes/register-agent-core-routes.ts
-var MAX_AVATAR_BYTES;
+var MAX_AVATAR_BYTES, VALID_AGENT_PERMISSION_KEYS;
 var init_register_agent_core_routes = __esm({
   "../dashboard/src/routes/register-agent-core-routes.ts"() {
     "use strict";
@@ -225675,6 +227051,7 @@ var init_register_agent_core_routes = __esm({
     init_api_error();
     init_src4();
     MAX_AVATAR_BYTES = 2 * 1024 * 1024;
+    VALID_AGENT_PERMISSION_KEYS = new Set(AGENT_PERMISSIONS);
   }
 });
 
@@ -225896,6 +227273,14 @@ var init_pagerduty = __esm({
   }
 });
 
+// ../dashboard/src/signal-sources/gitlab.ts
+var init_gitlab2 = __esm({
+  "../dashboard/src/signal-sources/gitlab.ts"() {
+    "use strict";
+    init_signal_source();
+  }
+});
+
 // ../dashboard/src/routes/register-signal-routes.ts
 var init_register_signal_routes = __esm({
   "../dashboard/src/routes/register-signal-routes.ts"() {
@@ -225907,6 +227292,7 @@ var init_register_signal_routes = __esm({
     init_sentry();
     init_datadog();
     init_pagerduty();
+    init_gitlab2();
   }
 });
 
@@ -225979,17 +227365,32 @@ var init_droid_cli_probe = __esm({
 
 // ../../plugins/fusion-plugin-cursor-runtime/src/cli-spawn.ts
 import { spawn as spawn15 } from "node:child_process";
+function formatSpawnError(error2) {
+  const code = typeof error2.code === "string" ? `${error2.code}: ` : "";
+  return `spawn error: ${code}${error2.message}`.trim();
+}
 async function runCursorCommand(binary, args, timeoutMs) {
   return new Promise((resolve34) => {
-    const child = spawn15(binary, args, { stdio: ["ignore", "pipe", "pipe"] });
     let stdout = "";
     let stderr = "";
-    const timer = setTimeout(() => {
+    let settled = false;
+    let timer;
+    const finish = (result) => {
+      if (settled) return;
+      settled = true;
+      if (timer) clearTimeout(timer);
+      resolve34(result);
+    };
+    const child = spawn15(binary, args, {
+      stdio: ["ignore", "pipe", "pipe"],
+      shell: process.platform === "win32"
+    });
+    timer = setTimeout(() => {
       try {
         child.kill("SIGKILL");
       } catch {
       }
-      resolve34({ code: 124, stdout, stderr });
+      finish({ code: 124, stdout, stderr });
     }, timeoutMs);
     child.stdout?.on("data", (c) => {
       stdout += c.toString("utf-8");
@@ -225997,13 +227398,14 @@ async function runCursorCommand(binary, args, timeoutMs) {
     child.stderr?.on("data", (c) => {
       stderr += c.toString("utf-8");
     });
-    child.once("error", () => {
-      clearTimeout(timer);
-      resolve34({ code: 127, stdout, stderr });
+    child.once("error", (error2) => {
+      const diagnostic = formatSpawnError(error2);
+      stderr = stderr ? `${stderr}
+${diagnostic}` : diagnostic;
+      finish({ code: 127, stdout, stderr });
     });
     child.once("close", (code) => {
-      clearTimeout(timer);
-      resolve34({ code, stdout, stderr });
+      finish({ code, stdout, stderr });
     });
   });
 }
@@ -226014,20 +227416,40 @@ var init_cli_spawn2 = __esm({
 });
 
 // ../../plugins/fusion-plugin-cursor-runtime/src/probe.ts
+function buildCandidates(binaryPath) {
+  const configuredBinaryPath = binaryPath?.trim() || void 0;
+  const ordered = configuredBinaryPath ? [configuredBinaryPath, ...CANDIDATES2] : [...CANDIDATES2];
+  return { candidates: Array.from(new Set(ordered)), configuredBinaryPath };
+}
+function summarizeFailure(binary, stdout, stderr) {
+  const detail = `${stderr || stdout}`.replace(/\s+/g, " ").trim();
+  if (!detail) return void 0;
+  const truncated = detail.length > MAX_FAILURE_DETAIL_LENGTH ? `${detail.slice(0, MAX_FAILURE_DETAIL_LENGTH - 1)}\u2026` : detail;
+  return `${binary}: ${truncated}`;
+}
 async function probeCursorBinary(options) {
   const startedAt = Date.now();
   const timeoutMs = options?.timeoutMs ?? 3e3;
-  const candidates = options?.binaryPath ? [options.binaryPath] : [...CANDIDATES2];
+  const { candidates, configuredBinaryPath } = buildCandidates(options?.binaryPath);
+  const failureDetails = [];
   for (const binary of candidates) {
     const version2 = await runCursorCommand(binary, ["--version"], timeoutMs);
+    const failureDetail = summarizeFailure(binary, version2.stdout, version2.stderr);
+    if (failureDetail) failureDetails.push(failureDetail);
+    const common = {
+      binaryName: binary,
+      binaryPath: binary,
+      configuredBinaryPath,
+      usingConfiguredBinaryPath: configuredBinaryPath === binary,
+      diagnostics: failureDetails.length > 0 ? [...failureDetails] : void 0,
+      probeDurationMs: Date.now() - startedAt
+    };
     if (version2.code === 0) {
       return {
         available: true,
         authenticated: true,
-        binaryName: binary,
-        binaryPath: binary,
-        version: version2.stdout.trim() || void 0,
-        probeDurationMs: Date.now() - startedAt
+        ...common,
+        version: version2.stdout.trim() || void 0
       };
     }
     const combined = `${version2.stdout}
@@ -226036,36 +227458,37 @@ ${version2.stderr}`.toLowerCase();
       return {
         available: true,
         authenticated: false,
-        binaryName: binary,
-        binaryPath: binary,
-        reason: "macOS login keychain is locked",
-        probeDurationMs: Date.now() - startedAt
+        ...common,
+        reason: "macOS login keychain is locked"
       };
     }
     if (combined.includes("no cursor ide installation found")) {
       return {
         available: true,
         authenticated: false,
-        binaryName: binary,
-        binaryPath: binary,
-        reason: "Cursor IDE installation not found",
-        probeDurationMs: Date.now() - startedAt
+        ...common,
+        reason: "Cursor IDE installation not found"
       };
     }
   }
+  const baseReason = configuredBinaryPath ? `Configured Cursor CLI binary '${configuredBinaryPath}' failed; PATH fallback cursor-agent/cursor also failed` : "cursor-agent/cursor not found on PATH";
   return {
     available: false,
     authenticated: false,
-    reason: "cursor-agent/cursor not found on PATH",
+    configuredBinaryPath,
+    usingConfiguredBinaryPath: false,
+    diagnostics: failureDetails.length > 0 ? failureDetails : void 0,
+    reason: failureDetails.length > 0 ? `${baseReason} (${failureDetails.join("; ")})` : baseReason,
     probeDurationMs: Date.now() - startedAt
   };
 }
-var CANDIDATES2;
+var CANDIDATES2, MAX_FAILURE_DETAIL_LENGTH;
 var init_probe4 = __esm({
   "../../plugins/fusion-plugin-cursor-runtime/src/probe.ts"() {
     "use strict";
     init_cli_spawn2();
     CANDIDATES2 = ["cursor-agent", "cursor"];
+    MAX_FAILURE_DETAIL_LENGTH = 180;
   }
 });
 
@@ -226109,12 +227532,20 @@ var init_process_manager = __esm({
 });
 
 // ../../plugins/fusion-plugin-cursor-runtime/src/provider.ts
-async function discoverCursorProviderModels() {
-  const probe = await probeCursorBinary();
+function normalizeDiscoveryOptions(options) {
+  if (!options || typeof options !== "object") return {};
+  const record2 = options;
+  return {
+    binaryPath: typeof record2.binaryPath === "string" ? record2.binaryPath : void 0,
+    timeoutMs: typeof record2.timeoutMs === "number" ? record2.timeoutMs : void 0
+  };
+}
+async function discoverCursorProviderModels(options) {
+  const probe = await probeCursorBinary(normalizeDiscoveryOptions(options));
   if (!probe.available || !probe.binaryName) {
     return { models: [], source: "probe", fallbackUsed: true, reason: probe.reason ?? "binary unavailable" };
   }
-  const result = await discoverCursorModels(probe.binaryName);
+  const result = await discoverCursorModels(probe.binaryPath ?? probe.binaryName);
   return {
     models: result.models.map((id) => ({ id, label: id })),
     source: result.source,
@@ -229072,6 +230503,7 @@ var init_routes = __esm({
     init_register_secrets_routes();
     init_register_messaging_scripts();
     init_register_git_github();
+    init_register_gitlab();
     init_register_files_terminal_workspaces();
     init_register_agents_projects_nodes();
     init_register_project_routes();
@@ -229356,7 +230788,7 @@ var init_otel_exporter = __esm({
 
 // ../dashboard/src/server.ts
 import express2 from "express";
-import { join as join64, dirname as dirname28 } from "node:path";
+import { join as join64, dirname as dirname29 } from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 import { WebSocketServer as WebSocketServer2 } from "ws";
 function clearAiSessionCleanupInterval() {
@@ -229402,7 +230834,7 @@ var init_server2 = __esm({
     init_reliability_metrics();
     init_view_chunk_manifest();
     init_otel_exporter();
-    __dirname = dirname28(fileURLToPath6(import.meta.url));
+    __dirname = dirname29(fileURLToPath6(import.meta.url));
     MIN_AI_SESSION_TTL_MS = 10 * 60 * 1e3;
     MAX_AI_SESSION_TTL_MS = 30 * 24 * 60 * 60 * 1e3;
     MIN_AI_SESSION_CLEANUP_INTERVAL_MS = 60 * 1e3;
@@ -229470,6 +230902,8 @@ var init_src11 = __esm({
     init_github_tracking2();
     init_github_tracking_dedup();
     init_github_tracking_hook();
+    init_gitlab();
+    init_gitlab_auth();
     init_github_auth();
     init_rate_limit();
     init_github_poll();
@@ -229493,7 +230927,7 @@ var init_src11 = __esm({
 });
 
 // src/project-context.ts
-import { resolve as resolve32, dirname as dirname29, basename as basename17 } from "node:path";
+import { resolve as resolve32, dirname as dirname30, basename as basename17 } from "node:path";
 async function resolveProject(projectNameFlag, cwd = process.cwd(), globalDir) {
   const central = new CentralCore(globalDir);
   await central.init();
@@ -229586,7 +231020,7 @@ async function detectProjectFromCwd(cwd, central) {
         };
       }
     }
-    const parentDir = dirname29(currentDir);
+    const parentDir = dirname30(currentDir);
     if (parentDir === currentDir) {
       break;
     }
@@ -229818,6 +231252,7 @@ __export(task_exports, {
   runTaskDeps: () => runTaskDeps,
   runTaskDuplicate: () => runTaskDuplicate,
   runTaskImportFromGitHub: () => runTaskImportFromGitHub,
+  runTaskImportFromGitLab: () => runTaskImportFromGitLab,
   runTaskImportGitHubInteractive: () => runTaskImportGitHubInteractive,
   runTaskList: () => runTaskList,
   runTaskLog: () => runTaskLog,
@@ -229889,6 +231324,8 @@ function formatTaskSource(task) {
       const issueUrl = getGitHubIssueUrl(task.sourceMetadata);
       return issueUrl ? `GitHub Import (${issueUrl})` : "GitHub Import";
     }
+    case "gitlab_import":
+      return "GitLab Import";
     case "research": {
       const context = getResearchSourceContext(task.sourceMetadata);
       return context ? `Research (${context})` : "Research";
@@ -230939,6 +232376,55 @@ Source: ${issue2.html_url}`;
   console.log(`  \u2713 Imported ${created} tasks from ${owner}/${repo}${skipped > 0 ? ` (${skipped} skipped)` : ""}`);
   console.log();
 }
+async function createGitLabClientForStore(store) {
+  const projectSettings = await store.getSettings();
+  const globalSettings = await store.getGlobalSettingsStore().getSettings();
+  const auth2 = resolveGitlabAuth({ projectSettings, globalSettings });
+  if (!auth2.ok) throw new Error(auth2.message);
+  return new GitLabClient(auth2.auth);
+}
+async function runTaskImportFromGitLab(target, options = {}, projectName) {
+  const resource = options.resource ?? "project-issues";
+  const store = await getStore(projectName);
+  const client = await createGitLabClientForStore(store);
+  console.log(`
+  Importing GitLab ${resource} from ${target}...
+`);
+  const labelArray = options.labels ?? [];
+  const items = resource === "project-issues" ? await client.listProjectIssues(target, { limit: options.limit, labels: labelArray }) : resource === "group-issues" ? await client.listGroupIssues(target, { limit: options.limit, labels: labelArray }) : await client.listMergeRequests(target, { limit: options.limit, labels: labelArray });
+  if (items.length === 0) {
+    console.log("  No GitLab resources found.\n");
+    return;
+  }
+  const existingTasks = await store.listTasks({ slim: false, includeArchived: false });
+  let created = 0;
+  let skipped = 0;
+  for (const item of items) {
+    const provenance = buildGitLabTaskProvenance({ auth: client.auth, resourceType: resource === "merge-requests" ? "merge_request" : resource === "group-issues" ? "group_issue" : "project_issue", item, projectInput: resource !== "group-issues" ? target : void 0, groupInput: resource === "group-issues" ? target : void 0 });
+    if (existingTasks.some((task2) => isGitLabAlreadyImported(task2, provenance))) {
+      console.log(`  \u2192 Skipping #${item.iid}: already imported`);
+      skipped += 1;
+      continue;
+    }
+    const title = resource === "merge-requests" ? `Review MR !${item.iid}: ${item.title.slice(0, 180)}` : item.title.slice(0, 200);
+    const task = await store.createTask({
+      title: title || void 0,
+      description: buildGitLabTaskDescription(item),
+      column: "triage",
+      dependencies: [],
+      sourceIssue: provenance.sourceIssue,
+      gitlabTracking: provenance.gitlabTracking,
+      source: { sourceType: "gitlab_import", sourceMetadata: provenance.sourceMetadata }
+    });
+    await store.logEntry(task.id, resource === "merge-requests" ? "Imported merge request from GitLab" : "Imported from GitLab", item.webUrl);
+    existingTasks.push(task);
+    created += 1;
+    console.log(`  \u2713 Created ${task.id}: ${task.title}`);
+  }
+  console.log(`
+  \u2713 Imported ${created} GitLab tasks${skipped > 0 ? ` (${skipped} skipped)` : ""}
+`);
+}
 async function runTaskComment(id, message, author = "user", projectName) {
   const store = await getStore(projectName);
   let text = message;
@@ -232837,6 +234323,107 @@ ${sourceUrl}`
       };
     }
   });
+  async function createGitLabClient(ctx) {
+    const store = await getStore2(ctx.cwd);
+    const projectSettings = await store.getSettings();
+    const globalSettings = await store.getGlobalSettingsStore().getSettings();
+    const auth2 = resolveGitlabAuth({ projectSettings, globalSettings });
+    if (!auth2.ok) throw new Error(auth2.message);
+    return { store, client: new GitLabClient(auth2.auth) };
+  }
+  async function importGitLabItems(ctx, resourceType, target, items) {
+    const { store, client } = await createGitLabClient(ctx);
+    const existingTasks = await store.listTasks({ slim: false, includeArchived: false });
+    const createdTasks = [];
+    for (const item of items) {
+      const provenance = buildGitLabTaskProvenance({ auth: client.auth, resourceType, item, projectInput: resourceType !== "group_issue" ? target : void 0, groupInput: resourceType === "group_issue" ? target : void 0 });
+      if (existingTasks.some((task2) => isGitLabAlreadyImported(task2, provenance))) continue;
+      const title = resourceType === "merge_request" ? `Review MR !${item.iid}: ${item.title.slice(0, 180)}` : item.title.slice(0, 200);
+      const task = await store.createTask({ title: title || void 0, description: buildGitLabTaskDescription(item), column: "triage", dependencies: [], sourceIssue: provenance.sourceIssue, gitlabTracking: provenance.gitlabTracking, source: { sourceType: "gitlab_import", sourceMetadata: provenance.sourceMetadata } });
+      await store.logEntry(task.id, resourceType === "merge_request" ? "Imported merge request from GitLab" : "Imported from GitLab", item.webUrl);
+      existingTasks.push(task);
+      createdTasks.push({ id: task.id, title: task.title || item.title });
+    }
+    return createdTasks;
+  }
+  pi2.registerTool({
+    name: "fn_task_browse_gitlab_project_issues",
+    label: "fn: Browse GitLab Project Issues",
+    description: "List GitLab project issues from the configured GitLab instance.",
+    promptSnippet: "Browse GitLab project issues",
+    parameters: Type9.Object({ project: Type9.String({ description: "GitLab project path or numeric ID" }), limit: Type9.Optional(Type9.Number({ minimum: 1, maximum: 100 })), labels: Type9.Optional(Type9.Array(Type9.String())) }),
+    async execute(_id, params, _signal, _onUpdate, ctx) {
+      const { client } = await createGitLabClient(ctx);
+      const issues = await client.listProjectIssues(params.project, { limit: params.limit, labels: params.labels });
+      return { content: [{ type: "text", text: issues.map((issue2) => `#${issue2.iid}: ${issue2.title}
+${issue2.webUrl}`).join("\n") || `No GitLab project issues found in ${params.project}.` }], details: { count: issues.length, issues } };
+    }
+  });
+  pi2.registerTool({
+    name: "fn_task_import_gitlab_project_issues",
+    label: "fn: Import GitLab Project Issues",
+    description: "Import GitLab project issues as Fusion tasks using configured GitLab HTTP API auth.",
+    promptSnippet: "Import GitLab project issues",
+    parameters: Type9.Object({ project: Type9.String({ description: "GitLab project path or numeric ID" }), limit: Type9.Optional(Type9.Number({ minimum: 1, maximum: 100 })), labels: Type9.Optional(Type9.Array(Type9.String())) }),
+    async execute(_id, params, _signal, _onUpdate, ctx) {
+      const { client } = await createGitLabClient(ctx);
+      const issues = await client.listProjectIssues(params.project, { limit: params.limit, labels: params.labels });
+      const createdTasks = await importGitLabItems(ctx, "project_issue", params.project, issues);
+      return { content: [{ type: "text", text: `Imported ${createdTasks.length} GitLab project issue tasks.` }], details: { createdTasks } };
+    }
+  });
+  pi2.registerTool({
+    name: "fn_task_browse_gitlab_group_issues",
+    label: "fn: Browse GitLab Group Issues",
+    description: "List GitLab group issues while preserving each issue's originating project identity.",
+    promptSnippet: "Browse GitLab group issues",
+    parameters: Type9.Object({ group: Type9.String({ description: "GitLab group path or numeric ID" }), limit: Type9.Optional(Type9.Number({ minimum: 1, maximum: 100 })), labels: Type9.Optional(Type9.Array(Type9.String())) }),
+    async execute(_id, params, _signal, _onUpdate, ctx) {
+      const { client } = await createGitLabClient(ctx);
+      const issues = await client.listGroupIssues(params.group, { limit: params.limit, labels: params.labels });
+      return { content: [{ type: "text", text: issues.map((issue2) => `#${issue2.iid}: ${issue2.projectPath ?? issue2.projectId} \u2014 ${issue2.title}
+${issue2.webUrl}`).join("\n") || `No GitLab group issues found in ${params.group}.` }], details: { count: issues.length, issues } };
+    }
+  });
+  pi2.registerTool({
+    name: "fn_task_import_gitlab_group_issues",
+    label: "fn: Import GitLab Group Issues",
+    description: "Import GitLab group issues as Fusion tasks using each issue's originating project identity.",
+    promptSnippet: "Import GitLab group issues",
+    parameters: Type9.Object({ group: Type9.String({ description: "GitLab group path or numeric ID" }), limit: Type9.Optional(Type9.Number({ minimum: 1, maximum: 100 })), labels: Type9.Optional(Type9.Array(Type9.String())) }),
+    async execute(_id, params, _signal, _onUpdate, ctx) {
+      const { client } = await createGitLabClient(ctx);
+      const issues = await client.listGroupIssues(params.group, { limit: params.limit, labels: params.labels });
+      const createdTasks = await importGitLabItems(ctx, "group_issue", params.group, issues);
+      return { content: [{ type: "text", text: `Imported ${createdTasks.length} GitLab group issue tasks.` }], details: { createdTasks } };
+    }
+  });
+  pi2.registerTool({
+    name: "fn_task_browse_gitlab_merge_requests",
+    label: "fn: Browse GitLab Merge Requests",
+    description: "List GitLab project merge requests from the configured GitLab instance.",
+    promptSnippet: "Browse GitLab merge requests",
+    parameters: Type9.Object({ project: Type9.String({ description: "GitLab project path or numeric ID" }), limit: Type9.Optional(Type9.Number({ minimum: 1, maximum: 100 })), labels: Type9.Optional(Type9.Array(Type9.String())) }),
+    async execute(_id, params, _signal, _onUpdate, ctx) {
+      const { client } = await createGitLabClient(ctx);
+      const mergeRequests = await client.listMergeRequests(params.project, { limit: params.limit, labels: params.labels });
+      return { content: [{ type: "text", text: mergeRequests.map((mr2) => `!${mr2.iid}: ${mr2.title}
+${mr2.webUrl}`).join("\n") || `No GitLab merge requests found in ${params.project}.` }], details: { count: mergeRequests.length, mergeRequests } };
+    }
+  });
+  pi2.registerTool({
+    name: "fn_task_import_gitlab_merge_requests",
+    label: "fn: Import GitLab Merge Requests",
+    description: "Import GitLab project merge requests as Fusion review tasks using configured GitLab HTTP API auth.",
+    promptSnippet: "Import GitLab merge requests",
+    parameters: Type9.Object({ project: Type9.String({ description: "GitLab project path or numeric ID" }), limit: Type9.Optional(Type9.Number({ minimum: 1, maximum: 100 })), labels: Type9.Optional(Type9.Array(Type9.String())) }),
+    async execute(_id, params, _signal, _onUpdate, ctx) {
+      const { client } = await createGitLabClient(ctx);
+      const mergeRequests = await client.listMergeRequests(params.project, { limit: params.limit, labels: params.labels });
+      const createdTasks = await importGitLabItems(ctx, "merge_request", params.project, mergeRequests);
+      return { content: [{ type: "text", text: `Imported ${createdTasks.length} GitLab merge request tasks.` }], details: { createdTasks } };
+    }
+  });
   pi2.registerTool({
     name: "fn_task_plan",
     label: "fn: Plan Task",
@@ -234777,6 +236364,214 @@ Status: ${updated.status}`
       };
     }
   });
+  pi2.registerTool({
+    name: "fn_agent_update",
+    label: "fn: Update Agent",
+    description: "Update editable configuration for an existing non-ephemeral agent. Agent callers can only update direct or indirect reports inside their management subtree; user/operator calls are privileged.",
+    promptSnippet: "Update an existing Fusion agent without deleting and recreating it",
+    promptGuidelines: [
+      "Use to update editable agent configuration such as role, instructions, manager, and heartbeat settings",
+      "Agent callers can only target direct or indirect reports, never themselves, peers, ancestors, or unrelated agents",
+      'Use reportsTo as an agent ID/name for a new manager; privileged user/operator calls may pass reportsTo: "" to clear the manager'
+    ],
+    parameters: Type9.Object({
+      agent_id: Type9.String({ description: "Target agent ID or name to update" }),
+      name: Type9.Optional(Type9.String({ description: "New display name" })),
+      role: Type9.Optional(Type9.Union([
+        Type9.Literal("triage"),
+        Type9.Literal("executor"),
+        Type9.Literal("reviewer"),
+        Type9.Literal("merger"),
+        Type9.Literal("engineer"),
+        Type9.Literal("custom")
+      ], { description: "Agent role/capability" })),
+      title: Type9.Optional(Type9.String({ description: "Optional title shown for the agent" })),
+      icon: Type9.Optional(Type9.String({ description: "Optional compact icon/emoji" })),
+      soul: Type9.Optional(Type9.String({ description: "Agent personality/identity text", maxLength: 1e4 })),
+      instructions_text: Type9.Optional(Type9.String({ description: "Inline custom instructions", maxLength: 5e4 })),
+      instructions_path: Type9.Optional(Type9.String({ description: "Path to instructions markdown", maxLength: 500 })),
+      heartbeat_procedure_path: Type9.Optional(Type9.String({ description: "Path to heartbeat procedure markdown", maxLength: 500 })),
+      reportsTo: Type9.Optional(Type9.String({ description: "Manager agent ID/name. Pass empty string to clear for privileged user/operator calls." })),
+      heartbeat_interval_ms: Type9.Optional(Type9.Number({ minimum: 1e3, description: "Heartbeat polling interval in ms" })),
+      heartbeat_timeout_ms: Type9.Optional(Type9.Number({ minimum: 5e3, description: "Heartbeat timeout in ms" })),
+      max_concurrent_runs: Type9.Optional(Type9.Number({ minimum: 1, description: "Max concurrent heartbeat runs" })),
+      message_response_mode: Type9.Optional(Type9.Union([
+        Type9.Literal("immediate"),
+        Type9.Literal("on-heartbeat")
+      ], { description: "How agent responds to messages" }))
+    }),
+    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      const { AgentStore: AgentStore2 } = await Promise.resolve().then(() => (init_src(), src_exports));
+      const agentStore = new AgentStore2({ rootDir: getFusionDir(ctx.cwd) });
+      await agentStore.init();
+      const updateParamKeys = [
+        "name",
+        "role",
+        "title",
+        "icon",
+        "soul",
+        "instructions_text",
+        "instructions_path",
+        "heartbeat_procedure_path",
+        "reportsTo",
+        "heartbeat_interval_ms",
+        "heartbeat_timeout_ms",
+        "max_concurrent_runs",
+        "message_response_mode"
+      ];
+      const providedKeys = updateParamKeys.filter((key) => params[key] !== void 0);
+      const invalid = (field, message, extra = {}) => ({
+        content: [{ type: "text", text: `ERROR: ${message}` }],
+        isError: true,
+        details: { outcome: "invalid", field, error: message, ...extra }
+      });
+      const denied = (message, extra = {}) => ({
+        content: [{ type: "text", text: `ERROR: ${message}` }],
+        isError: true,
+        details: { outcome: "denied", error: message, ...extra }
+      });
+      if (providedKeys.length === 0) {
+        return invalid("fields", "Provide at least one field to update");
+      }
+      if (params.soul !== void 0 && params.soul.length > 1e4) {
+        return invalid("soul", "soul exceeds 10000 character limit");
+      }
+      if (params.instructions_text !== void 0 && params.instructions_text.length > 5e4) {
+        return invalid("instructions_text", "instructions_text exceeds 50000 character limit");
+      }
+      if (params.instructions_path !== void 0 && params.instructions_path.length > 500) {
+        return invalid("instructions_path", "instructions_path exceeds 500 character limit");
+      }
+      if (params.heartbeat_procedure_path !== void 0 && params.heartbeat_procedure_path.length > 500) {
+        return invalid("heartbeat_procedure_path", "heartbeat_procedure_path exceeds 500 character limit");
+      }
+      if (params.heartbeat_interval_ms !== void 0 && params.heartbeat_interval_ms < 1e3) {
+        return invalid("heartbeat_interval_ms", "heartbeat_interval_ms must be at least 1000");
+      }
+      if (params.heartbeat_timeout_ms !== void 0 && params.heartbeat_timeout_ms < 5e3) {
+        return invalid("heartbeat_timeout_ms", "heartbeat_timeout_ms must be at least 5000");
+      }
+      if (params.max_concurrent_runs !== void 0 && params.max_concurrent_runs < 1) {
+        return invalid("max_concurrent_runs", "max_concurrent_runs must be at least 1");
+      }
+      const target = await agentStore.getAgent(params.agent_id) ?? await agentStore.resolveAgent(params.agent_id);
+      if (!target) {
+        return {
+          content: [{ type: "text", text: `Agent '${params.agent_id}' not found` }],
+          isError: true,
+          details: { outcome: "not_found", error: "Agent not found", agentId: params.agent_id }
+        };
+      }
+      if (isEphemeralAgent(target)) {
+        return invalid("agent_id", `Cannot update ephemeral/runtime agent ${target.id}`, { agentId: target.id });
+      }
+      const fnCtx = ctx;
+      const callerAgentId = fnCtx.agentId;
+      const targetChain = await agentStore.getChainOfCommand(target.id);
+      if (callerAgentId) {
+        if (callerAgentId === target.id) {
+          return denied("You can only update your own direct or indirect reports, not yourself.", {
+            agentId: target.id,
+            callerAgentId,
+            rule: "direct-or-indirect-reports-only"
+          });
+        }
+        const callerIndex = targetChain.findIndex((agent) => agent.id === callerAgentId);
+        if (callerIndex < 1) {
+          return denied("You can only update your own direct or indirect reports.", {
+            agentId: target.id,
+            callerAgentId,
+            rule: "direct-or-indirect-reports-only"
+          });
+        }
+      }
+      let resolvedReportsTo;
+      let managerForCycleCheck;
+      if (params.reportsTo !== void 0) {
+        if (params.reportsTo === "") {
+          if (callerAgentId) {
+            return denied("Only privileged user/operator calls can clear an agent's manager.", {
+              agentId: target.id,
+              callerAgentId,
+              rule: "privileged-clear-manager-only"
+            });
+          }
+          resolvedReportsTo = void 0;
+        } else {
+          const manager = await agentStore.resolveAgent(params.reportsTo);
+          if (!manager) {
+            return invalid("reportsTo", `Manager '${params.reportsTo}' not found`, { agentId: target.id });
+          }
+          if (manager.id === target.id) {
+            return invalid("reportsTo", "An agent cannot report to itself", { agentId: target.id });
+          }
+          const managerChain = await agentStore.getChainOfCommand(manager.id);
+          if (managerChain.some((agent) => agent.id === target.id)) {
+            return invalid("reportsTo", "reportsTo would create a management cycle", {
+              agentId: target.id,
+              managerId: manager.id
+            });
+          }
+          if (callerAgentId) {
+            const managerCallerIndex = managerChain.findIndex((agent) => agent.id === callerAgentId);
+            if (manager.id !== callerAgentId && managerCallerIndex < 1) {
+              return denied("You can only reparent reports to yourself or another agent in your management subtree.", {
+                agentId: target.id,
+                callerAgentId,
+                managerId: manager.id,
+                rule: "reparent-within-subtree-only"
+              });
+            }
+          }
+          resolvedReportsTo = manager.id;
+          managerForCycleCheck = manager.id;
+        }
+      }
+      const hasRuntimeConfigUpdates = [
+        params.heartbeat_interval_ms,
+        params.heartbeat_timeout_ms,
+        params.max_concurrent_runs,
+        params.message_response_mode
+      ].some((value) => value !== void 0);
+      const updateInput = {};
+      const updatedFields = [];
+      const setField = (field, value) => {
+        updateInput[field] = value;
+        updatedFields.push(String(field));
+      };
+      if (params.name !== void 0) setField("name", params.name);
+      if (params.role !== void 0) setField("role", params.role);
+      if (params.title !== void 0) setField("title", params.title);
+      if (params.icon !== void 0) setField("icon", params.icon);
+      if (params.soul !== void 0) setField("soul", params.soul);
+      if (params.instructions_text !== void 0) setField("instructionsText", params.instructions_text);
+      if (params.instructions_path !== void 0) setField("instructionsPath", params.instructions_path);
+      if (params.heartbeat_procedure_path !== void 0) setField("heartbeatProcedurePath", params.heartbeat_procedure_path);
+      if (params.reportsTo !== void 0) {
+        setField("reportsTo", resolvedReportsTo);
+      }
+      if (hasRuntimeConfigUpdates) {
+        setField("runtimeConfig", {
+          ...target.runtimeConfig ?? {},
+          ...params.heartbeat_interval_ms !== void 0 ? { heartbeatIntervalMs: params.heartbeat_interval_ms } : {},
+          ...params.heartbeat_timeout_ms !== void 0 ? { heartbeatTimeoutMs: params.heartbeat_timeout_ms } : {},
+          ...params.max_concurrent_runs !== void 0 ? { maxConcurrentRuns: params.max_concurrent_runs } : {},
+          ...params.message_response_mode !== void 0 ? { messageResponseMode: params.message_response_mode } : {}
+        });
+      }
+      if (managerForCycleCheck && managerForCycleCheck === target.id) {
+        return invalid("reportsTo", "An agent cannot report to itself", { agentId: target.id });
+      }
+      const updated = await agentStore.updateAgent(target.id, updateInput);
+      return {
+        content: [{
+          type: "text",
+          text: `Updated ${updated.name} (${updated.id}): ${updatedFields.join(", ")}`
+        }],
+        details: { outcome: "updated", agentId: updated.id, updatedFields, agent: updated }
+      };
+    }
+  });
   pi2.registerTool({
     name: "fn_agent_set_instructions",
     label: "fn: Set Agent Instructions",