@jmoyers/harness 0.1.9 → 0.1.11

package/src/services/runtime-conversation-starter.ts

@@ -33,6 +33,13 @@ interface RuntimeConversationStarterLaunchArgsInput {
 
 type RuntimeConversationStarterSpanAttributes = Record<string, string | number | boolean>;
 
+function isSessionAlreadyExistsError(error: unknown): boolean {
+  if (!(error instanceof Error)) {
+    return false;
+  }
+  return error.message.includes('session already exists');
+}
+
 export interface RuntimeConversationStarterOptions<
   TConversation extends RuntimeConversationStarterConversationRecord,
   TSessionSummary,
@@ -134,19 +141,36 @@ export class RuntimeConversationStarter<
       if (this.options.terminalBackgroundHex !== undefined) {
         ptyStartInput.terminalBackgroundHex = this.options.terminalBackgroundHex;
       }
-      await this.options.startPtySession(ptyStartInput);
+      let startedSession = false;
+      try {
+        await this.options.startPtySession(ptyStartInput);
+        startedSession = true;
+      } catch (error: unknown) {
+        if (!isSessionAlreadyExistsError(error)) {
+          throw error;
+        }
+      }
       this.options.setPtySize(sessionId, {
         cols: layout.rightCols,
         rows: layout.paneRows,
       });
       this.options.sendResize(sessionId, layout.rightCols, layout.paneRows);
-      this.endStartCommandSpanIfTarget(sessionId, {
-        alreadyLive: false,
-        argCount: launchArgs.length,
-        resumed: launchArgs[0] === 'resume',
-      });
+      if (startedSession) {
+        this.endStartCommandSpanIfTarget(sessionId, {
+          alreadyLive: false,
+          argCount: launchArgs.length,
+          resumed: launchArgs[0] === 'resume',
+        });
+      } else {
+        this.endStartCommandSpanIfTarget(sessionId, {
+          alreadyLive: true,
+          recoveredDuplicateStart: true,
+        });
+      }
       const state = this.options.ensureConversation(sessionId);
-      this.options.recordStartCommand(sessionId, launchArgs);
+      if (startedSession) {
+        this.options.recordStartCommand(sessionId, launchArgs);
+      }
       const statusSummary = await this.options.getSessionStatus(sessionId);
       if (statusSummary !== null) {
         this.options.upsertFromSessionSummary(statusSummary);

package/src/services/runtime-input-router.ts

@@ -41,6 +41,7 @@ interface RuntimeInputRouterOptions {
   readonly scheduleConversationTitlePersist: () => void;
   readonly resolveCommandMenuActions: () => readonly CommandMenuActionDescriptor[];
   readonly executeCommandMenuAction: (actionId: string) => void;
+  readonly persistApiKey?: RuntimeModalInputOptions['persistApiKey'];
   readonly requestStop: RuntimeRailInputOptions['requestStop'];
   readonly resolveDirectoryForAction: RuntimeRailInputOptions['resolveDirectoryForAction'];
   readonly toggleCommandMenu: RuntimeRailInputOptions['toggleCommandMenu'];
@@ -112,6 +113,11 @@ export class RuntimeInputRouter {
       scheduleConversationTitlePersist: options.scheduleConversationTitlePersist,
       resolveCommandMenuActions: options.resolveCommandMenuActions,
       executeCommandMenuAction: options.executeCommandMenuAction,
+      ...(options.persistApiKey === undefined
+        ? {}
+        : {
+            persistApiKey: options.persistApiKey,
+          }),
     });
     const runtimeRailOptions: RuntimeRailInputOptions = {
       workspace: options.workspace,

package/src/services/runtime-modal-input.ts

@@ -37,6 +37,7 @@ interface RuntimeModalInputOptions {
   readonly scheduleConversationTitlePersist: () => void;
   readonly resolveCommandMenuActions: () => readonly CommandMenuActionDescriptor[];
   readonly executeCommandMenuAction: (actionId: string) => void;
+  readonly persistApiKey?: (keyName: string, value: string) => void;
   readonly markDirty: () => void;
 }
 
@@ -97,6 +98,23 @@ export class RuntimeModalInput {
       submitTaskEditorPayload: (payload) => {
         options.taskEditorActions.submitTaskEditorPayload(payload);
       },
+      ...(options.persistApiKey === undefined
+        ? {}
+        : {
+            getApiKeyPrompt: () => options.workspace.apiKeyPrompt,
+            setApiKeyPrompt: (
+              next: {
+                keyName: string;
+                displayName: string;
+                value: string;
+                error: string | null;
+                hasExistingValue: boolean;
+              } | null,
+            ) => {
+              options.workspace.apiKeyPrompt = next;
+            },
+            persistApiKey: options.persistApiKey,
+          }),
       getConversationTitleEdit: () => options.workspace.conversationTitleEdit,
       getNewThreadPrompt: () => options.workspace.newThreadPrompt,
       setNewThreadPrompt: (prompt) => {

package/src/services/runtime-navigation-input.ts

@@ -17,6 +17,7 @@ interface RuntimeNavigationWorkspaceActions {
   toggleGatewayStatusTimeline(): Promise<void>;
   toggleGatewayRenderTrace(conversationId: string | null): Promise<void>;
   archiveConversation(sessionId: string): Promise<void>;
+  refreshAllConversationTitles(): Promise<void>;
   interruptConversation(sessionId: string): Promise<void>;
   takeoverConversation(sessionId: string): Promise<void>;
   closeDirectory(directoryId: string): Promise<void>;
@@ -157,6 +158,9 @@ export class RuntimeNavigationInput {
       archiveConversation: async (sessionId) => {
         await options.workspaceActions.archiveConversation(sessionId);
       },
+      refreshAllConversationTitles: async () => {
+        await options.workspaceActions.refreshAllConversationTitles();
+      },
       interruptConversation: async (sessionId) => {
         await options.workspaceActions.interruptConversation(sessionId);
       },

package/src/services/runtime-rail-input.ts

@@ -15,6 +15,7 @@ interface RuntimeRailWorkspaceActions {
   toggleGatewayStatusTimeline(): Promise<void>;
   toggleGatewayRenderTrace(conversationId: string | null): Promise<void>;
   archiveConversation(sessionId: string): Promise<void>;
+  refreshAllConversationTitles(): Promise<void>;
   interruptConversation(sessionId: string): Promise<void>;
   takeoverConversation(sessionId: string): Promise<void>;
   closeDirectory(directoryId: string): Promise<void>;
@@ -142,6 +143,9 @@ export class RuntimeRailInput {
         archiveConversation: async (sessionId) => {
           await options.runtimeWorkspaceActions.archiveConversation(sessionId);
         },
+        refreshAllConversationTitles: async () => {
+          await options.runtimeWorkspaceActions.refreshAllConversationTitles();
+        },
         interruptConversation: async (sessionId) => {
           await options.runtimeWorkspaceActions.interruptConversation(sessionId);
         },
@@ -266,6 +270,7 @@ export class RuntimeRailInput {
 
   private openAddDirectoryPrompt(): void {
     this.options.workspace.repositoryPrompt = null;
+    this.options.workspace.apiKeyPrompt = null;
     this.options.workspace.addDirectoryPrompt = {
       value: '',
       error: null,

package/src/services/runtime-repository-actions.ts

@@ -55,6 +55,7 @@ export class RuntimeRepositoryActions<TRepository extends RepositoryRecordShape>
   openRepositoryPromptForCreate(): void {
     this.options.workspace.newThreadPrompt = null;
     this.options.workspace.addDirectoryPrompt = null;
+    this.options.workspace.apiKeyPrompt = null;
     if (this.options.workspace.conversationTitleEdit !== null) {
       this.options.stopConversationTitleEdit();
     }
@@ -75,6 +76,7 @@ export class RuntimeRepositoryActions<TRepository extends RepositoryRecordShape>
     }
     this.options.workspace.newThreadPrompt = null;
     this.options.workspace.addDirectoryPrompt = null;
+    this.options.workspace.apiKeyPrompt = null;
     if (this.options.workspace.conversationTitleEdit !== null) {
       this.options.stopConversationTitleEdit();
     }

package/src/services/runtime-workspace-actions.ts

@@ -30,6 +30,7 @@ interface RuntimeWorkspaceControlActions {
   toggleGatewayProfiler(): Promise<void>;
   toggleGatewayStatusTimeline(): Promise<void>;
   toggleGatewayRenderTrace(conversationId: string | null): Promise<void>;
+  refreshAllConversationTitles(): Promise<void>;
 }
 
 interface RuntimeWorkspaceTaskPaneActions {
@@ -135,6 +136,10 @@ export class RuntimeWorkspaceActions {
     await this.options.controlActions.toggleGatewayRenderTrace(conversationId);
   }
 
+  async refreshAllConversationTitles(): Promise<void> {
+    await this.options.controlActions.refreshAllConversationTitles();
+  }
+
   runTaskPaneAction(action: TaskPaneAction): void {
     this.options.taskPaneActions.runTaskPaneAction(action);
   }

package/src/store/control-plane-store.ts

@@ -355,6 +355,8 @@ interface ListGitHubSyncStateQuery {
   limit?: number;
 }
 
+const CONTROL_PLANE_SCHEMA_VERSION = 1;
+
 export class SqliteControlPlaneStore {
   private readonly db: DatabaseSync;
 
@@ -2628,6 +2630,24 @@ export class SqliteControlPlaneStore {
   }
 
   private initializeSchema(): void {
+    this.db.exec('BEGIN IMMEDIATE TRANSACTION');
+    try {
+      const currentVersion = this.readSchemaVersion();
+      if (currentVersion > CONTROL_PLANE_SCHEMA_VERSION) {
+        throw new Error(
+          `control-plane schema version ${String(currentVersion)} is newer than supported version ${String(CONTROL_PLANE_SCHEMA_VERSION)}`,
+        );
+      }
+      this.applySchemaV1();
+      this.writeSchemaVersion(CONTROL_PLANE_SCHEMA_VERSION);
+      this.db.exec('COMMIT');
+    } catch (error) {
+      this.db.exec('ROLLBACK');
+      throw error;
+    }
+  }
+
+  private applySchemaV1(): void {
     this.db.exec(`
       CREATE TABLE IF NOT EXISTS directories (
         directory_id TEXT PRIMARY KEY,
@@ -2923,6 +2943,22 @@ export class SqliteControlPlaneStore {
     `);
   }
 
+  private readSchemaVersion(): number {
+    const row = this.db.prepare('PRAGMA user_version;').get();
+    if (row === undefined) {
+      throw new Error('failed to read control-plane schema version');
+    }
+    const version = (row as Record<string, unknown>)['user_version'];
+    if (typeof version !== 'number' || !Number.isInteger(version) || version < 0) {
+      throw new Error(`invalid control-plane schema version value: ${String(version)}`);
+    }
+    return version;
+  }
+
+  private writeSchemaVersion(version: number): void {
+    this.db.exec(`PRAGMA user_version = ${String(version)};`);
+  }
+
   private configureConnection(): void {
     this.db.exec('PRAGMA journal_mode = WAL;');
     this.db.exec('PRAGMA synchronous = NORMAL;');

package/src/store/event-store.ts

@@ -31,6 +31,8 @@ interface PersistedEvent {
   event: NormalizedEventEnvelope;
 }
 
+const EVENT_STORE_SCHEMA_VERSION = 1;
+
 function asObject(value: unknown): Record<string, unknown> {
   if (typeof value !== 'object' || value === null) {
     throw new Error('expected object row');
@@ -214,6 +216,24 @@ export class SqliteEventStore {
   }
 
   private initializeSchema(): void {
+    this.db.exec('BEGIN IMMEDIATE TRANSACTION');
+    try {
+      const currentVersion = this.readSchemaVersion();
+      if (currentVersion > EVENT_STORE_SCHEMA_VERSION) {
+        throw new Error(
+          `event store schema version ${String(currentVersion)} is newer than supported version ${String(EVENT_STORE_SCHEMA_VERSION)}`,
+        );
+      }
+      this.applySchemaV1();
+      this.writeSchemaVersion(EVENT_STORE_SCHEMA_VERSION);
+      this.db.exec('COMMIT');
+    } catch (error) {
+      this.db.exec('ROLLBACK');
+      throw error;
+    }
+  }
+
+  private applySchemaV1(): void {
     this.db.exec(`
       CREATE TABLE IF NOT EXISTS events (
         row_id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -236,6 +256,22 @@ export class SqliteEventStore {
     `);
   }
 
+  private readSchemaVersion(): number {
+    const row = this.db.prepare('PRAGMA user_version;').get();
+    if (row === undefined) {
+      throw new Error('failed to read event store schema version');
+    }
+    const version = (row as Record<string, unknown>)['user_version'];
+    if (typeof version !== 'number' || !Number.isInteger(version) || version < 0) {
+      throw new Error(`invalid event store schema version value: ${String(version)}`);
+    }
+    return version;
+  }
+
+  private writeSchemaVersion(version: number): void {
+    this.db.exec(`PRAGMA user_version = ${String(version)};`);
+  }
+
   private configureConnection(): void {
     this.db.exec('PRAGMA journal_mode = WAL;');
     this.db.exec('PRAGMA synchronous = NORMAL;');

package/src/ui/global-shortcut-input.ts

@@ -23,6 +23,7 @@ interface GlobalShortcutInputOptions {
   readonly conversationsHas: (sessionId: string) => boolean;
   readonly queueControlPlaneOp: (task: () => Promise<void>, label: string) => void;
   readonly archiveConversation: (sessionId: string) => Promise<void>;
+  readonly refreshAllConversationTitles: () => Promise<void>;
   readonly interruptConversation: (sessionId: string) => Promise<void>;
   readonly takeoverConversation: (sessionId: string) => Promise<void>;
   readonly openAddDirectoryPrompt: () => void;
@@ -70,6 +71,7 @@ export class GlobalShortcutInput {
       conversationsHas: this.options.conversationsHas,
       queueControlPlaneOp: this.options.queueControlPlaneOp,
       archiveConversation: this.options.archiveConversation,
+      refreshAllConversationTitles: this.options.refreshAllConversationTitles,
       interruptConversation: this.options.interruptConversation,
       takeoverConversation: this.options.takeoverConversation,
       openAddDirectoryPrompt: this.options.openAddDirectoryPrompt,

package/src/ui/input.ts

@@ -4,11 +4,13 @@ import {
   handleNewThreadPromptInput as handleNewThreadPromptInputFrame,
 } from '../mux/live-mux/modal-conversation-handlers.ts';
 import {
+  handleApiKeyPromptInput as handleApiKeyPromptInputFrame,
   handleAddDirectoryPromptInput as handleAddDirectoryPromptInputFrame,
   handleRepositoryPromptInput as handleRepositoryPromptInputFrame,
 } from '../mux/live-mux/modal-prompt-handlers.ts';
 import { handleTaskEditorPromptInput as handleTaskEditorPromptInputFrame } from '../mux/live-mux/modal-task-editor-handler.ts';
 import type {
+  ApiKeyPromptState,
   ConversationTitleEditState,
   RepositoryPromptState,
   TaskEditorPromptState,
@@ -63,6 +65,9 @@ interface InputRouterOptions {
   readonly getTaskEditorPrompt: () => TaskEditorPromptState | null;
   readonly setTaskEditorPrompt: (next: TaskEditorPromptState | null) => void;
   readonly submitTaskEditorPayload: (payload: TaskEditorSubmitPayload) => void;
+  readonly getApiKeyPrompt?: () => ApiKeyPromptState | null;
+  readonly setApiKeyPrompt?: (next: ApiKeyPromptState | null) => void;
+  readonly persistApiKey?: (keyName: string, value: string) => void;
   readonly getConversationTitleEdit: () => ConversationTitleEditState | null;
   readonly getCommandMenu: () => CommandMenuState | null;
   readonly setCommandMenu: (menu: CommandMenuState | null) => void;
@@ -84,6 +89,7 @@ interface InputRouterOptions {
 interface InputRouterDependencies {
   readonly handleCommandMenuInput?: typeof handleCommandMenuInputFrame;
   readonly handleTaskEditorPromptInput?: typeof handleTaskEditorPromptInputFrame;
+  readonly handleApiKeyPromptInput?: typeof handleApiKeyPromptInputFrame;
   readonly handleConversationTitleEditInput?: typeof handleConversationTitleEditInputFrame;
   readonly handleNewThreadPromptInput?: typeof handleNewThreadPromptInputFrame;
   readonly handleAddDirectoryPromptInput?: typeof handleAddDirectoryPromptInputFrame;
@@ -93,6 +99,7 @@ interface InputRouterDependencies {
 export class InputRouter {
   private readonly handleCommandMenuInputFrame: typeof handleCommandMenuInputFrame;
   private readonly handleTaskEditorPromptInputFrame: typeof handleTaskEditorPromptInputFrame;
+  private readonly handleApiKeyPromptInputFrame: typeof handleApiKeyPromptInputFrame;
   private readonly handleConversationTitleEditInputFrame: typeof handleConversationTitleEditInputFrame;
   private readonly handleNewThreadPromptInputFrame: typeof handleNewThreadPromptInputFrame;
   private readonly handleAddDirectoryPromptInputFrame: typeof handleAddDirectoryPromptInputFrame;
@@ -106,6 +113,8 @@ export class InputRouter {
       dependencies.handleCommandMenuInput ?? handleCommandMenuInputFrame;
     this.handleTaskEditorPromptInputFrame =
       dependencies.handleTaskEditorPromptInput ?? handleTaskEditorPromptInputFrame;
+    this.handleApiKeyPromptInputFrame =
+      dependencies.handleApiKeyPromptInput ?? handleApiKeyPromptInputFrame;
     this.handleConversationTitleEditInputFrame =
       dependencies.handleConversationTitleEditInput ?? handleConversationTitleEditInputFrame;
     this.handleNewThreadPromptInputFrame =
@@ -168,6 +177,25 @@ export class InputRouter {
     });
   }
 
+  handleApiKeyPromptInput(input: Buffer): boolean {
+    if (
+      this.options.getApiKeyPrompt === undefined ||
+      this.options.setApiKeyPrompt === undefined ||
+      this.options.persistApiKey === undefined
+    ) {
+      return false;
+    }
+    return this.handleApiKeyPromptInputFrame({
+      input,
+      prompt: this.options.getApiKeyPrompt(),
+      isQuitShortcut: this.options.isModalDismissShortcut,
+      dismissOnOutsideClick: this.options.dismissOnOutsideClick,
+      setPrompt: this.options.setApiKeyPrompt,
+      markDirty: this.options.markDirty,
+      persistApiKey: this.options.persistApiKey,
+    });
+  }
+
   handleNewThreadPromptInput(input: Buffer): boolean {
     return this.handleNewThreadPromptInputFrame({
       input,
@@ -224,6 +252,9 @@ export class InputRouter {
     if (this.handleRepositoryPromptInput(input)) {
       return true;
     }
+    if (this.handleApiKeyPromptInput(input)) {
+      return true;
+    }
     if (this.handleNewThreadPromptInput(input)) {
       return true;
     }

package/src/ui/modals/manager.ts

@@ -1,6 +1,7 @@
 import {
   buildCommandMenuModalOverlay as buildCommandMenuModalOverlayFrame,
   buildAddDirectoryModalOverlay as buildAddDirectoryModalOverlayFrame,
+  buildApiKeyModalOverlay as buildApiKeyModalOverlayFrame,
   buildConversationTitleModalOverlay as buildConversationTitleModalOverlayFrame,
   buildNewThreadModalOverlay as buildNewThreadModalOverlayFrame,
   buildRepositoryModalOverlay as buildRepositoryModalOverlayFrame,
@@ -21,6 +22,13 @@ import { isUiModalOverlayHit } from '../kit.ts';
 
 type NewThreadPromptState = ReturnType<typeof createNewThreadPromptState>;
 type AddDirectoryPromptState = { value: string; error: string | null };
+type ApiKeyPromptState = {
+  keyName: string;
+  displayName: string;
+  value: string;
+  error: string | null;
+  hasExistingValue: boolean;
+};
 type ModalOverlay = Exclude<ReturnType<typeof buildNewThreadModalOverlayFrame>, null>;
 type ModalTheme = Parameters<typeof buildNewThreadModalOverlayFrame>[3];
 type DismissModalOnOutsideClickInput = Parameters<typeof dismissModalOnOutsideClickFrame>[0];
@@ -32,6 +40,7 @@ interface ModalManagerOptions {
   readonly resolveCommandMenuActions: () => readonly CommandMenuActionDescriptor[];
   readonly getNewThreadPrompt: () => NewThreadPromptState | null;
   readonly getAddDirectoryPrompt: () => AddDirectoryPromptState | null;
+  readonly getApiKeyPrompt?: () => ApiKeyPromptState | null;
   readonly getTaskEditorPrompt: () => TaskEditorPromptState | null;
   readonly getRepositoryPrompt: () => RepositoryPromptState | null;
   readonly getConversationTitleEdit: () => ConversationTitleEditState | null;
@@ -42,6 +51,7 @@ interface ModalManagerDependencies {
   readonly buildNewThreadModalOverlay?: typeof buildNewThreadModalOverlayFrame;
   readonly buildAddDirectoryModalOverlay?: typeof buildAddDirectoryModalOverlayFrame;
   readonly buildTaskEditorModalOverlay?: typeof buildTaskEditorModalOverlayFrame;
+  readonly buildApiKeyModalOverlay?: typeof buildApiKeyModalOverlayFrame;
   readonly buildRepositoryModalOverlay?: typeof buildRepositoryModalOverlayFrame;
   readonly buildConversationTitleModalOverlay?: typeof buildConversationTitleModalOverlayFrame;
   readonly dismissModalOnOutsideClick?: typeof dismissModalOnOutsideClickFrame;
@@ -67,6 +77,7 @@ export class ModalManager {
   private readonly buildNewThreadModalOverlay: typeof buildNewThreadModalOverlayFrame;
   private readonly buildAddDirectoryModalOverlay: typeof buildAddDirectoryModalOverlayFrame;
   private readonly buildTaskEditorModalOverlay: typeof buildTaskEditorModalOverlayFrame;
+  private readonly buildApiKeyModalOverlay: typeof buildApiKeyModalOverlayFrame;
   private readonly buildRepositoryModalOverlay: typeof buildRepositoryModalOverlayFrame;
   private readonly buildConversationTitleModalOverlay: typeof buildConversationTitleModalOverlayFrame;
   private readonly dismissModalOnOutsideClick: typeof dismissModalOnOutsideClickFrame;
@@ -84,6 +95,8 @@ export class ModalManager {
       dependencies.buildAddDirectoryModalOverlay ?? buildAddDirectoryModalOverlayFrame;
     this.buildTaskEditorModalOverlay =
       dependencies.buildTaskEditorModalOverlay ?? buildTaskEditorModalOverlayFrame;
+    this.buildApiKeyModalOverlay =
+      dependencies.buildApiKeyModalOverlay ?? buildApiKeyModalOverlayFrame;
     this.buildRepositoryModalOverlay =
       dependencies.buildRepositoryModalOverlay ?? buildRepositoryModalOverlayFrame;
     this.buildConversationTitleModalOverlay =
@@ -131,6 +144,15 @@ export class ModalManager {
     );
   }
 
+  buildApiKeyOverlay(layoutCols: number, viewportRows: number): ModalOverlay | null {
+    return this.buildApiKeyModalOverlay(
+      layoutCols,
+      viewportRows,
+      this.options.getApiKeyPrompt?.() ?? null,
+      this.options.theme,
+    );
+  }
+
   buildRepositoryOverlay(layoutCols: number, viewportRows: number): ModalOverlay | null {
     return this.buildRepositoryModalOverlay(
       layoutCols,
@@ -166,6 +188,10 @@ export class ModalManager {
     if (taskEditorOverlay !== null) {
       return taskEditorOverlay;
     }
+    const apiKeyOverlay = this.buildApiKeyOverlay(layoutCols, viewportRows);
+    if (apiKeyOverlay !== null) {
+      return apiKeyOverlay;
+    }
     const repositoryOverlay = this.buildRepositoryOverlay(layoutCols, viewportRows);
     if (repositoryOverlay !== null) {
       return repositoryOverlay;