gsd-pi 2.44.0-dev.73f2fd5 → 2.44.0-dev.8894d5b

package/packages/pi-coding-agent/src/core/auth-storage.ts

@@ -744,21 +744,7 @@ export class AuthStorage {
 	 * @param providerId - The provider to get an API key for
 	 * @param sessionId - Optional session ID for sticky credential selection
 	 */
-	async getApiKey(providerId: string, sessionId?: string, options?: { baseUrl?: string }): Promise<string | undefined> {
-		// If the model has a local baseUrl, return a dummy key to avoid auth blocking
-		if (options?.baseUrl) {
-			try {
-				const hostname = new URL(options.baseUrl).hostname;
-				if (hostname === "localhost" || hostname === "127.0.0.1" || hostname === "0.0.0.0" || hostname === "::1") {
-					return "local-no-key-needed";
-				}
-			} catch {
-				if (options.baseUrl.startsWith("unix:")) {
-					return "local-no-key-needed";
-				}
-			}
-		}
-
+	async getApiKey(providerId: string, sessionId?: string): Promise<string | undefined> {
 		// Runtime override takes highest priority
 		const runtimeKey = this.runtimeOverrides.get(providerId);
 		if (runtimeKey) {

package/packages/pi-coding-agent/src/core/model-registry.ts

@@ -28,7 +28,6 @@ import { ModelDiscoveryCache } from "./discovery-cache.js";
 import type { DiscoveredModel, DiscoveryResult } from "./model-discovery.js";
 import { getDefaultTTL, getDiscoverableProviders, getDiscoveryAdapter } from "./model-discovery.js";
 import { clearConfigValueCache, resolveConfigValue, resolveHeaders } from "./resolve-config-value.js";
-import { isLocalModel } from "./local-model-check.js";
 
 const Ajv = (AjvModule as any).default || AjvModule;
 const ajv = new Ajv();
@@ -558,7 +557,7 @@ export class ModelRegistry {
 	async getApiKey(model: Model<Api>, sessionId?: string): Promise<string | undefined> {
 		const authMode = this.getProviderAuthMode(model.provider);
 		if (authMode === "externalCli" || authMode === "none") return undefined;
-		return this.authStorage.getApiKey(model.provider, sessionId, { baseUrl: model.baseUrl });
+		return this.authStorage.getApiKey(model.provider, sessionId);
 	}
 
 	/**
@@ -808,25 +807,6 @@ export class ModelRegistry {
 		}
 		return converted;
 	}
-
-	/**
-	 * Check if a model's baseUrl points to a local endpoint.
-	 * Delegates to standalone isLocalModel() function.
-	 */
-	static isLocalModel(model: Model<Api>): boolean {
-		return isLocalModel(model);
-	}
-
-	/**
-	 * Check if all models in the registry are local.
-	 * Returns true only if every model passes isLocalModel().
-	 * Returns false if there are no models.
-	 */
-	isAllLocalChain(): boolean {
-		const models = this.getAll();
-		if (models.length === 0) return false;
-		return models.every((m) => isLocalModel(m));
-	}
 }
 
 /**

package/packages/pi-coding-agent/src/core/settings-manager.ts

@@ -151,7 +151,6 @@ export interface Settings {
 	fallback?: FallbackSettings;
 	modelDiscovery?: ModelDiscoverySettings;
 	editMode?: "standard" | "hashline"; // Edit tool mode: "standard" (text match) or "hashline" (LINE#ID anchors). Default: "standard"
-	timestampFormat?: "date-time-iso" | "date-time-us"; // Timestamp display format for messages. Default: "date-time-iso"
 }
 
 /** Deep merge settings: project/overrides take precedence, nested objects merge recursively */
@@ -1088,12 +1087,4 @@ export class SettingsManager {
 	setEditMode(mode: "standard" | "hashline"): void {
 		this.setGlobalSetting("editMode", mode);
 	}
-
-	getTimestampFormat(): "date-time-iso" | "date-time-us" {
-		return this.settings.timestampFormat ?? "date-time-iso";
-	}
-
-	setTimestampFormat(format: "date-time-iso" | "date-time-us"): void {
-		this.setGlobalSetting("timestampFormat", format);
-	}
 }

package/packages/pi-coding-agent/src/main.ts

@@ -391,25 +391,6 @@ export async function main(args: string[]) {
 	const authStorage = AuthStorage.create();
 	const modelRegistry = new ModelRegistry(authStorage, getModelsPath());
 
-	// Offline mode validation / auto-detection
-	if (offlineMode) {
-		// --offline flag: validate all models are local
-		if (!modelRegistry.isAllLocalChain()) {
-			const remoteModel = modelRegistry.getAll().find((m) => !ModelRegistry.isLocalModel(m));
-			if (remoteModel) {
-				console.error(
-					`Error: --offline requires all configured models to be local. Found remote model: ${remoteModel.name} (${remoteModel.baseUrl || "cloud API"})`,
-				);
-				process.exit(1);
-			}
-		}
-	} else if (modelRegistry.isAllLocalChain() && modelRegistry.getAll().length > 0) {
-		// Auto-detect: all models are local, enable offline mode
-		process.env.PI_OFFLINE = "1";
-		process.env.PI_SKIP_VERSION_CHECK = "1";
-		console.log("[gsd] All configured models are local \u2014 enabling offline mode automatically.");
-	}
-
 	const resourceLoader = new DefaultResourceLoader({
 		cwd,
 		agentDir,

package/packages/pi-coding-agent/src/modes/interactive/components/assistant-message.ts

@@ -1,7 +1,6 @@
 import type { AssistantMessage } from "@gsd/pi-ai";
 import { Container, Markdown, type MarkdownTheme, Spacer, Text } from "@gsd/pi-tui";
 import { getMarkdownTheme, theme } from "../theme/theme.js";
-import { formatTimestamp, type TimestampFormat } from "./timestamp.js";
 
 /**
  * Component that renders a complete assistant message
@@ -11,19 +10,16 @@ export class AssistantMessageComponent extends Container {
 	private hideThinkingBlock: boolean;
 	private markdownTheme: MarkdownTheme;
 	private lastMessage?: AssistantMessage;
-	private timestampFormat: TimestampFormat;
 
 	constructor(
 		message?: AssistantMessage,
 		hideThinkingBlock = false,
 		markdownTheme: MarkdownTheme = getMarkdownTheme(),
-		timestampFormat: TimestampFormat = "date-time-iso",
 	) {
 		super();
 
 		this.hideThinkingBlock = hideThinkingBlock;
 		this.markdownTheme = markdownTheme;
-		this.timestampFormat = timestampFormat;
 
 		// Container for text/thinking content
 		this.contentContainer = new Container();
@@ -115,11 +111,5 @@ export class AssistantMessageComponent extends Container {
 				this.contentContainer.addChild(new Text(theme.fg("error", `Error: ${errorMsg}`), 1, 0));
 			}
 		}
-
-		// Show timestamp when the message is complete (has a stop reason)
-		if (message.stopReason && message.timestamp) {
-			const timeStr = formatTimestamp(message.timestamp, this.timestampFormat);
-			this.contentContainer.addChild(new Text(theme.fg("dim", timeStr), 1, 0));
-		}
 	}
 }

package/packages/pi-coding-agent/src/modes/interactive/components/settings-selector.ts

@@ -45,7 +45,6 @@ export interface SettingsConfig {
 	respectGitignoreInPicker: boolean;
 	quietStartup: boolean;
 	clearOnShrink: boolean;
-	timestampFormat: "date-time-iso" | "date-time-us";
 }
 
 export interface SettingsCallbacks {
@@ -70,7 +69,6 @@ export interface SettingsCallbacks {
 	onRespectGitignoreInPickerChange: (enabled: boolean) => void;
 	onQuietStartupChange: (enabled: boolean) => void;
 	onClearOnShrinkChange: (enabled: boolean) => void;
-	onTimestampFormatChange: (format: "date-time-iso" | "date-time-us") => void;
 	onCancel: () => void;
 }
 
@@ -357,16 +355,6 @@ export class SettingsSelectorComponent extends Container {
 			values: ["true", "false"],
 		});
 
-		// Timestamp format (insert after respect-gitignore-in-picker)
-		const gitignoreIndex = items.findIndex((item) => item.id === "respect-gitignore-in-picker");
-		items.splice(gitignoreIndex + 1, 0, {
-			id: "timestamp-format",
-			label: "Timestamp format",
-			description: "Date/time format for message timestamps",
-			currentValue: config.timestampFormat,
-			values: ["date-time-iso", "date-time-us"],
-		});
-
 		// Add borders
 		this.addChild(new DynamicBorder());
 
@@ -432,9 +420,6 @@ export class SettingsSelectorComponent extends Container {
 					case "respect-gitignore-in-picker":
 						callbacks.onRespectGitignoreInPickerChange(newValue === "true");
 						break;
-					case "timestamp-format":
-						callbacks.onTimestampFormatChange(newValue as "date-time-iso" | "date-time-us");
-						break;
 				}
 			},
 			callbacks.onCancel,

package/packages/pi-coding-agent/src/modes/interactive/components/tool-execution.ts

@@ -895,9 +895,7 @@ export class ToolExecutionComponent extends Container {
 			// Server-side Anthropic web search
 			text = theme.fg("toolTitle", theme.bold("web search"));
 
-			if (process.env.PI_OFFLINE === "1") {
-				text += "\n\n" + theme.fg("muted", "\u{1F50C} Offline \u{2014} web search unavailable");
-			} else if (this.result) {
+			if (this.result) {
 				const output = this.getTextOutput().trim();
 				if (output) {
 					const lines = output.split("\n");

package/packages/pi-coding-agent/src/modes/interactive/components/user-message.ts

@@ -1,21 +1,15 @@
-import { Container, Markdown, type MarkdownTheme, Spacer, Text } from "@gsd/pi-tui";
+import { Container, Markdown, type MarkdownTheme, Spacer } from "@gsd/pi-tui";
 import { getMarkdownTheme, theme } from "../theme/theme.js";
-import { formatTimestamp, type TimestampFormat } from "./timestamp.js";
 
 const OSC133_ZONE_START = "\x1b]133;A\x07";
 const OSC133_ZONE_END = "\x1b]133;B\x07";
 
 /**
- * Component that renders a user message with a right-aligned timestamp.
+ * Component that renders a user message
  */
 export class UserMessageComponent extends Container {
-	private timestamp: number | undefined;
-	private timestampFormat: TimestampFormat;
-
-	constructor(text: string, markdownTheme: MarkdownTheme = getMarkdownTheme(), timestamp?: number, timestampFormat: TimestampFormat = "date-time-iso") {
+	constructor(text: string, markdownTheme: MarkdownTheme = getMarkdownTheme()) {
 		super();
-		this.timestamp = timestamp;
-		this.timestampFormat = timestampFormat;
 		this.addChild(new Spacer(1));
 		this.addChild(
 			new Markdown(text, 1, 1, markdownTheme, {
@@ -31,15 +25,6 @@ export class UserMessageComponent extends Container {
 			return lines;
 		}
 
-		// Insert right-aligned timestamp above the message content
-		if (this.timestamp) {
-			const timeStr = formatTimestamp(this.timestamp, this.timestampFormat);
-			const label = theme.fg("dim", timeStr);
-			const padding = Math.max(0, width - timeStr.length - 1);
-			const timestampLine = " ".repeat(padding) + label;
-			lines.splice(0, 0, timestampLine);
-		}
-
 		lines[0] = OSC133_ZONE_START + lines[0];
 		lines[lines.length - 1] = lines[lines.length - 1] + OSC133_ZONE_END;
 		return lines;

package/packages/pi-coding-agent/src/modes/interactive/controllers/chat-controller.ts

@@ -100,7 +100,6 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 					undefined,
 					host.hideThinkingBlock,
 					host.getMarkdownThemeWithSettings(),
-					host.settingsManager.getTimestampFormat(),
 				);
 				host.streamingMessage = event.message;
 				host.chatContainer.addChild(host.streamingComponent);
@@ -145,21 +144,13 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 					} else if (content.type === "webSearchResult") {
 						const component = host.pendingTools.get(content.toolUseId);
 						if (component) {
-							if (process.env.PI_OFFLINE === "1") {
-								component.updateResult({
-									content: [{ type: "text", text: "Web search disabled (offline mode)" }],
-									isError: false,
-								});
-								host.pendingTools.delete(content.toolUseId);
-							} else {
-								const searchContent = content.content;
-								const isError = searchContent && typeof searchContent === "object" && "type" in (searchContent as any) && (searchContent as any).type === "web_search_tool_result_error";
-								component.updateResult({
-									content: [{ type: "text", text: host.formatWebSearchResult(searchContent) }],
-									isError: !!isError,
-								});
-								host.pendingTools.delete(content.toolUseId);
-							}
+							const searchContent = content.content;
+							const isError = searchContent && typeof searchContent === "object" && "type" in (searchContent as any) && (searchContent as any).type === "web_search_tool_result_error";
+							component.updateResult({
+								content: [{ type: "text", text: host.formatWebSearchResult(searchContent) }],
+								isError: !!isError,
+							});
+							host.pendingTools.delete(content.toolUseId);
 						}
 					}
 				}

package/packages/pi-coding-agent/src/modes/interactive/interactive-mode.ts

@@ -2099,13 +2099,11 @@ export class InteractiveMode {
 							const userComponent = new UserMessageComponent(
 								skillBlock.userMessage,
 								this.getMarkdownThemeWithSettings(),
-								message.timestamp,
-								this.settingsManager.getTimestampFormat(),
 							);
 							this.chatContainer.addChild(userComponent);
 						}
 					} else {
-						const userComponent = new UserMessageComponent(textContent, this.getMarkdownThemeWithSettings(), message.timestamp, this.settingsManager.getTimestampFormat());
+						const userComponent = new UserMessageComponent(textContent, this.getMarkdownThemeWithSettings());
 						this.chatContainer.addChild(userComponent);
 					}
 					if (options?.populateHistory) {
@@ -2119,7 +2117,6 @@ export class InteractiveMode {
 					message,
 					this.hideThinkingBlock,
 					this.getMarkdownThemeWithSettings(),
-					this.settingsManager.getTimestampFormat(),
 				);
 				this.chatContainer.addChild(assistantComponent);
 				break;
@@ -2798,7 +2795,6 @@ export class InteractiveMode {
 					respectGitignoreInPicker: this.settingsManager.getRespectGitignoreInPicker(),
 					quietStartup: this.settingsManager.getQuietStartup(),
 					clearOnShrink: this.settingsManager.getClearOnShrink(),
-					timestampFormat: this.settingsManager.getTimestampFormat(),
 				},
 				{
 					onAutoCompactChange: (enabled) => {
@@ -2902,9 +2898,6 @@ export class InteractiveMode {
 						this.settingsManager.setRespectGitignoreInPicker(enabled);
 						this.autocompleteProvider?.setRespectGitignore(enabled);
 					},
-					onTimestampFormatChange: (format) => {
-						this.settingsManager.setTimestampFormat(format);
-					},
 					onCancel: () => {
 						done();
 						this.ui.requestRender();

package/src/resources/extensions/gsd/auto/infra-errors.ts

@@ -18,9 +18,6 @@ export const INFRA_ERROR_CODES: ReadonlySet<string> = new Set([
   "EDQUOT",   // disk quota exceeded
   "EMFILE",   // too many open files (process)
   "ENFILE",   // too many open files (system)
-  "ECONNREFUSED", // connection refused (offline / local server down)
-  "ENOTFOUND",    // DNS lookup failed (offline / no network)
-  "ENETUNREACH",  // network unreachable (offline / no route)
 ]);
 
 /**

package/src/resources/extensions/gsd/auto/phases.ts

@@ -27,9 +27,7 @@ import { debugLog } from "../debug-logger.js";
 import { gsdRoot } from "../paths.js";
 import { atomicWriteSync } from "../atomic-write.js";
 import { PROJECT_FILES } from "../detection.js";
-import { MergeConflictError } from "../git-service.js";
 import { join } from "node:path";
-import { existsSync, cpSync } from "node:fs";
 
 // ─── generateMilestoneReport ──────────────────────────────────────────────────
 
@@ -235,23 +233,26 @@ export async function runPreDispatch(
     loopState.stuckRecoveryAttempts = 0;
 
     // Worktree lifecycle on milestone transition — merge current, enter next
-    try {
-      deps.resolver.mergeAndExit(s.currentMilestoneId!, ctx.ui);
-    } catch (mergeErr) {
-      if (mergeErr instanceof MergeConflictError) {
-        // Real code conflicts — stop the loop instead of retrying forever (#2330)
-        ctx.ui.notify(
-          `Merge conflict: ${mergeErr.conflictedFiles.join(", ")}. Resolve conflicts manually and run /gsd auto to resume.`,
-          "error",
+    deps.resolver.mergeAndExit(s.currentMilestoneId!, ctx.ui);
+
+    // Opt-in: create draft PR on milestone completion
+    if (prefs?.git?.auto_pr) {
+      try {
+        const { createDraftPR } = await import("../git-service.js");
+        const prUrl = createDraftPR(
+          s.basePath,
+          s.currentMilestoneId!,
+          `[GSD] ${s.currentMilestoneId} complete`,
+          `Milestone ${s.currentMilestoneId} completed by GSD auto-mode.\n\nSee .gsd/${s.currentMilestoneId}/ for details.`,
         );
-        await deps.stopAuto(ctx, pi, `Merge conflict on milestone ${s.currentMilestoneId}`);
-        return { action: "break", reason: "merge-conflict" };
+        if (prUrl) {
+          ctx.ui.notify(`Draft PR created: ${prUrl}`, "info");
+        }
+      } catch {
+        // Non-fatal — PR creation is best-effort
       }
-      // Non-conflict errors — log and continue
     }
 
-    // PR creation (auto_pr) is handled inside mergeMilestoneToMain (#2302)
-
     deps.invalidateAllCaches();
 
     state = await deps.deriveState(s.basePath);
@@ -278,17 +279,9 @@ export async function runPreDispatch(
     // Reset completed-units tracking for the new milestone — stale entries
     // from the previous milestone cause the dispatch loop to skip units
     // that haven't actually been completed in the new milestone's context.
-    // Archive the old completed-units.json instead of wiping it (#2313).
     s.completedUnits = [];
     try {
       const completedKeysPath = join(gsdRoot(s.basePath), "completed-units.json");
-      if (existsSync(completedKeysPath) && s.currentMilestoneId) {
-        const archivePath = join(
-          gsdRoot(s.basePath),
-          `completed-units-${s.currentMilestoneId}.json`,
-        );
-        cpSync(completedKeysPath, archivePath);
-      }
       atomicWriteSync(completedKeysPath, JSON.stringify([], null, 2));
     } catch { /* non-fatal */ }
 
@@ -329,20 +322,25 @@ export async function runPreDispatch(
     if (incomplete.length === 0 && state.registry.length > 0) {
       // All milestones complete — merge milestone branch before stopping
       if (s.currentMilestoneId) {
-        try {
-          deps.resolver.mergeAndExit(s.currentMilestoneId, ctx.ui);
-        } catch (mergeErr) {
-          if (mergeErr instanceof MergeConflictError) {
-            ctx.ui.notify(
-              `Merge conflict: ${mergeErr.conflictedFiles.join(", ")}. Resolve conflicts manually and run /gsd auto to resume.`,
-              "error",
+        deps.resolver.mergeAndExit(s.currentMilestoneId, ctx.ui);
+
+        // Opt-in: create draft PR on milestone completion
+        if (prefs?.git?.auto_pr) {
+          try {
+            const { createDraftPR } = await import("../git-service.js");
+            const prUrl = createDraftPR(
+              s.basePath,
+              s.currentMilestoneId,
+              `[GSD] ${s.currentMilestoneId} complete`,
+              `Milestone ${s.currentMilestoneId} completed by GSD auto-mode.\n\nSee .gsd/${s.currentMilestoneId}/ for details.`,
             );
-            await deps.stopAuto(ctx, pi, `Merge conflict on milestone ${s.currentMilestoneId}`);
-            return { action: "break", reason: "merge-conflict" };
+            if (prUrl) {
+              ctx.ui.notify(`Draft PR created: ${prUrl}`, "info");
+            }
+          } catch {
+            // Non-fatal — PR creation is best-effort
           }
         }
-
-        // PR creation (auto_pr) is handled inside mergeMilestoneToMain (#2302)
       }
       deps.sendDesktopNotification(
         "GSD",
@@ -424,20 +422,25 @@ export async function runPreDispatch(
   if (state.phase === "complete") {
     // Milestone merge on complete (before closeout so branch state is clean)
     if (s.currentMilestoneId) {
-      try {
-        deps.resolver.mergeAndExit(s.currentMilestoneId, ctx.ui);
-      } catch (mergeErr) {
-        if (mergeErr instanceof MergeConflictError) {
-          ctx.ui.notify(
-            `Merge conflict: ${mergeErr.conflictedFiles.join(", ")}. Resolve conflicts manually and run /gsd auto to resume.`,
-            "error",
+      deps.resolver.mergeAndExit(s.currentMilestoneId, ctx.ui);
+
+      // Opt-in: create draft PR on milestone completion
+      if (prefs?.git?.auto_pr) {
+        try {
+          const { createDraftPR } = await import("../git-service.js");
+          const prUrl = createDraftPR(
+            s.basePath,
+            s.currentMilestoneId,
+            `[GSD] ${s.currentMilestoneId} complete`,
+            `Milestone ${s.currentMilestoneId} completed by GSD auto-mode.\n\nSee .gsd/${s.currentMilestoneId}/ for details.`,
           );
-          await deps.stopAuto(ctx, pi, `Merge conflict on milestone ${s.currentMilestoneId}`);
-          return { action: "break", reason: "merge-conflict" };
+          if (prUrl) {
+            ctx.ui.notify(`Draft PR created: ${prUrl}`, "info");
+          }
+        } catch {
+          // Non-fatal — PR creation is best-effort
         }
       }
-
-      // PR creation (auto_pr) is handled inside mergeMilestoneToMain (#2302)
     }
     deps.sendDesktopNotification(
       "GSD",

package/src/resources/extensions/gsd/auto-prompts.ts

@@ -1307,12 +1307,6 @@ export async function buildCompleteMilestonePrompt(
     roadmapPath: roadmapRel,
     inlinedContext,
     milestoneSummaryPath,
-    skillActivation: buildSkillActivationBlock({
-      base,
-      milestoneId: mid,
-      milestoneTitle: midTitle,
-      extraContext: [inlinedContext],
-    }),
   });
 }
 
@@ -1396,12 +1390,6 @@ export async function buildValidateMilestonePrompt(
     inlinedContext,
     validationPath: validationOutputPath,
     remediationRound: String(remediationRound),
-    skillActivation: buildSkillActivationBlock({
-      base,
-      milestoneId: mid,
-      milestoneTitle: midTitle,
-      extraContext: [inlinedContext],
-    }),
   });
 }
 
@@ -1512,12 +1500,6 @@ export async function buildRunUatPrompt(
     uatResultPath,
     uatType,
     inlinedContext,
-    skillActivation: buildSkillActivationBlock({
-      base,
-      milestoneId: mid,
-      sliceId,
-      extraContext: [inlinedContext],
-    }),
   });
 }
 
@@ -1570,16 +1552,11 @@ export async function buildReassessRoadmapPrompt(
     milestoneTitle: midTitle,
     completedSliceId,
     roadmapPath: roadmapRel,
+    completedSliceSummaryPath: summaryRel,
     assessmentPath,
     inlinedContext,
     deferredCaptures,
     commitInstruction: reassessCommitInstruction,
-    skillActivation: buildSkillActivationBlock({
-      base,
-      milestoneId: mid,
-      milestoneTitle: midTitle,
-      extraContext: [inlinedContext, deferredCaptures],
-    }),
   });
 }
 

package/src/resources/extensions/gsd/auto-timers.ts

@@ -8,7 +8,6 @@
 
 import type { ExtensionAPI, ExtensionContext } from "@gsd/pi-coding-agent";
 import { readUnitRuntimeRecord, writeUnitRuntimeRecord } from "./unit-runtime.js";
-import { isDbAvailable, getMilestoneSlices, getSliceTasks } from "./gsd-db.js";
 import { resolveAutoSupervisorConfig } from "./preferences.js";
 import type { GSDPreferences } from "./preferences.js";
 import { computeBudgets, resolveExecutorContextWindow } from "./context-budget.js";
@@ -33,8 +32,6 @@ export interface SupervisionContext {
   buildSnapshotOpts: () => CloseoutOptions & Record<string, unknown>;
   buildRecoveryContext: () => RecoveryContext;
   pauseAuto: (ctx?: ExtensionContext, pi?: ExtensionAPI) => Promise<void>;
-  /** Optional task estimate string (e.g. "30m", "2h") for timeout scaling (#2243). */
-  taskEstimate?: string;
 }
 
 /**
@@ -44,71 +41,13 @@ export interface SupervisionContext {
  * 3. Hard timeout (pause + recovery)
  * 4. Context-pressure monitor (continue-here)
  */
-
-/**
- * Parse a task estimate string (e.g. "30m", "2h", "1h30m") into minutes.
- * Returns null if the string cannot be parsed.
- */
-export function parseEstimateMinutes(estimate: string): number | null {
-  if (!estimate || typeof estimate !== "string") return null;
-  const trimmed = estimate.trim();
-  if (!trimmed) return null;
-
-  let totalMinutes = 0;
-  let matched = false;
-
-  // Match hours component
-  const hoursMatch = trimmed.match(/(\d+)\s*h/i);
-  if (hoursMatch) {
-    totalMinutes += Number(hoursMatch[1]) * 60;
-    matched = true;
-  }
-
-  // Match minutes component
-  const minutesMatch = trimmed.match(/(\d+)\s*m/i);
-  if (minutesMatch) {
-    totalMinutes += Number(minutesMatch[1]);
-    matched = true;
-  }
-
-  return matched ? totalMinutes : null;
-}
-
 export function startUnitSupervision(sctx: SupervisionContext): void {
   const { s, ctx, pi, unitType, unitId, prefs, buildSnapshotOpts, buildRecoveryContext, pauseAuto } = sctx;
 
   const supervisor = resolveAutoSupervisorConfig();
-
-  // Scale timeouts based on task estimate annotations (#2243).
-  // If the task has an est: annotation, use it to extend the hard and soft timeouts
-  // so longer tasks don't get prematurely timed out.
-  let taskEstimate = sctx.taskEstimate;
-  if (!taskEstimate && unitType === "task" && isDbAvailable()) {
-    // Look up the task estimate from the DB (#2243).
-    try {
-      if (s.currentMilestoneId) {
-        const slices = getMilestoneSlices(s.currentMilestoneId);
-        for (const slice of slices) {
-          const tasks = getSliceTasks(s.currentMilestoneId, slice.id);
-          const task = tasks.find(t => t.id === unitId);
-          if (task?.estimate) {
-            taskEstimate = task.estimate;
-            break;
-          }
-        }
-      }
-    } catch {
-      // Non-fatal — fall through with no estimate
-    }
-  }
-  const estimateMinutes = taskEstimate ? parseEstimateMinutes(taskEstimate) : null;
-  const timeoutScale = estimateMinutes && estimateMinutes > 0
-    ? Math.max(1, estimateMinutes / 10)  // 10min task = 1x, 30min = 3x, 2h = 12x
-    : 1;
-
-  const softTimeoutMs = (supervisor.soft_timeout_minutes ?? 0) * 60 * 1000 * timeoutScale;
-  const idleTimeoutMs = (supervisor.idle_timeout_minutes ?? 0) * 60 * 1000;  // idle not scaled — idle is idle
-  const hardTimeoutMs = (supervisor.hard_timeout_minutes ?? 0) * 60 * 1000 * timeoutScale;
+  const softTimeoutMs = (supervisor.soft_timeout_minutes ?? 0) * 60 * 1000;
+  const idleTimeoutMs = (supervisor.idle_timeout_minutes ?? 0) * 60 * 1000;
+  const hardTimeoutMs = (supervisor.hard_timeout_minutes ?? 0) * 60 * 1000;
 
   // ── 1. Soft timeout warning ──
   s.wrapupWarningHandle = setTimeout(() => {

package/src/resources/extensions/gsd/auto-worktree-sync.ts

@@ -93,11 +93,6 @@ export function syncStateToProjectRoot(
     { force: true },
   );
 
-  // 3. metrics.json — session cost/token tracking (#2313).
-  // Without this, metrics accumulated in the worktree are invisible from the
-  // project root and never appear in the dashboard or skill-health reports.
-  safeCopy(join(wtGsd, "metrics.json"), join(prGsd, "metrics.json"), { force: true });
-
   // 4. Runtime records — unit dispatch state used by selfHealRuntimeRecords().
   // Without this, a crash during a unit leaves the runtime record only in the
   // worktree. If the next session resolves basePath before worktree re-entry,