Merge branch 'main' of github.com:Kilo-Org/cloud into feature/kiloclaw-linear-cli

Author: evanjacobson

.github/workflows/ci.yml

@@ -115,6 +115,9 @@ jobs:
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
+      - name: Build trpc types
+        run: pnpm --filter @kilocode/trpc run build
+
       - name: Lint
         run: scripts/lint-all.sh
 

.gitignore

@@ -31,6 +31,9 @@ node_modules/
 # production
 /build
 
+# dev server port (written by scripts/dev.sh for multi-worktree support)
+.dev-port
+
 # debug
 npm-debug.log*
 yarn-debug.log*
@@ -60,6 +63,7 @@ dev-debug-request-logs/*
 
 # misc
 .DS_Store
+.eslintcache
 *.pem
 TMP_CI_commit_msg.txt
 *.csv
@@ -98,5 +102,5 @@ supabase/.temp
 
 .kilo/plans
 
-# @kilocode/trpc intermediate tsc output (bundled index.d.ts is committed)
-packages/trpc/dist/tsc/
+# @kilocode/trpc build output (rebuilt by: pnpm --filter @kilocode/trpc run build)
+packages/trpc/dist/

.kilocode/rules/tools.md

@@ -7,6 +7,6 @@
   - Date handling: date-fns
   - Database: drizzle-orm with pg
 - For React components, ALWAYS use React hooks with @tanstack/react-query for data fetching, caching, and server state management. Do not implement custom data fetching logic when react-query can handle it.
-- DO NOT RUN `pnpm run dev`! The webserver should already be running; try simply accessing it first via 'http://localhost:3000/'. If it does not appear to be running, EVEN THEN ASK FOR PERMISSION BEFORE RUNNING IT.
-- If you need to log in as a fake user, open http://localhost:3000/users/sign_in?fakeUser=<fake-email> where <fake-email> is constructed from "kilo-", my username (based on homedir), and the time (include seconds) and then '@example.com'. If you need an admin account, the email address must end in @admin.example.com. After logging in, wait for the creating your account spinner to complete before proceeding. The admin panels can be accessed from your profile via the account icon in the top-right corner, which opens a drop-down, allowing access to the admin panel.
+- The webserver should already be running. Read the dev server port from the `.dev-port` file in the project root (e.g., `cat .dev-port`), then access it via `http://localhost:<port>/`. If `.dev-port` does not exist, start the dev server by running `pnpm dev &` in the background, then wait for `.dev-port` to appear before reading the port from it.
+- If you need to log in as a fake user, open http://localhost:<port>/users/sign_in?fakeUser=<fake-email> where <port> is read from `.dev-port` (falling back to 3000) and <fake-email> is constructed from "kilo-", my username (based on homedir), and the time (include seconds) and then '@example.com'. If you need an admin account, the email address must end in @admin.example.com. After logging in, wait for the creating your account spinner to complete before proceeding. The admin panels can be accessed from your profile via the account icon in the top-right corner, which opens a drop-down, allowing access to the admin panel.
 - be sure to add the callbackPath url parameter to go directly to the page after logging in!

cloud-agent-next/drizzle/0001_add_entity_id.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `events` ADD COLUMN `entity_id` text;
+--> statement-breakpoint
+CREATE UNIQUE INDEX `events_entity_id_unique` ON `events` (`entity_id`);

cloud-agent-next/drizzle/meta/_journal.json

@@ -8,6 +8,13 @@
       "when": 1772242306388,
       "tag": "0000_high_mimic",
       "breakpoints": true
+    },
+    {
+      "idx": 1,
+      "version": "6",
+      "when": 1772242306389,
+      "tag": "0001_add_entity_id",
+      "breakpoints": true
     }
   ]
 }

cloud-agent-next/drizzle/migrations.js

@@ -1,9 +1,11 @@
 import journal from './meta/_journal.json';
 import m0000 from './0000_high_mimic.sql';
+import m0001 from './0001_add_entity_id.sql';
 
 export default {
   journal,
   migrations: {
     m0000,
+    m0001,
   },
 };

cloud-agent-next/src/db/sqlite-schema.ts

@@ -9,6 +9,7 @@ export const events = sqliteTable(
     stream_event_type: text('stream_event_type').notNull(),
     payload: text('payload').notNull(),
     timestamp: integer('timestamp').notNull(),
+    entity_id: text('entity_id').unique(),
   },
   table => [
     index('idx_events_execution').on(table.execution_id),

cloud-agent-next/src/kilo/client.ts

@@ -147,6 +147,7 @@ export class KiloClient {
             modelID: options.model.modelID,
           }
         : undefined,
+      variant: options?.variant,
       agent: options?.agent,
       noReply: options?.noReply,
       system: options?.system,

cloud-agent-next/src/kilo/types.ts

@@ -49,6 +49,8 @@ export interface CreateSessionOptions {
 export interface PromptOptions {
   messageId?: string;
   model?: { providerID?: string; modelID: string };
+  /** Thinking/reasoning effort variant (e.g., "high", "max", "low") */
+  variant?: string;
   agent?: string;
   noReply?: boolean;
   /** Custom system prompt override */

cloud-agent-next/src/persistence/CloudAgentSession.ts

@@ -51,7 +51,7 @@ import {
   type IngestDOContext,
 } from '../websocket/ingest.js';
 import type { StoredEvent } from '../websocket/types.js';
-import type { WrapperCommand, PreparingStep } from '../shared/protocol.js';
+import type { WrapperCommand, PreparingStep, CloudStatusData } from '../shared/protocol.js';
 import { STALE_THRESHOLD_MS, SANDBOX_SLEEP_AFTER_SECONDS } from '../core/lease.js';
 import { ExecutionOrchestrator, type OrchestratorDeps } from '../execution/orchestrator.js';
 import type {
@@ -126,7 +126,6 @@ export class CloudAgentSession extends DurableObject {
   private ingestHandlerSessionId?: SessionId;
   private sessionId?: SessionId;
   private orchestrator?: ExecutionOrchestrator;
-
   private isTerminalStatus(
     status: ExecutionStatus
   ): status is 'completed' | 'failed' | 'interrupted' {
@@ -251,7 +250,9 @@ export class CloudAgentSession extends DurableObject {
   private async getStreamHandler(expected?: SessionId): Promise<StreamHandler> {
     const sessionId = await this.requireSessionId(expected);
     if (!this.streamHandler || this.streamHandlerSessionId !== sessionId) {
-      this.streamHandler = createStreamHandler(this.ctx, this.eventQueries, sessionId);
+      this.streamHandler = createStreamHandler(this.ctx, this.eventQueries, sessionId, {
+        deriveCloudStatus: () => this.deriveCloudStatus(),
+      });
       this.streamHandlerSessionId = sessionId;
     }
     return this.streamHandler;
@@ -366,7 +367,14 @@ export class CloudAgentSession extends DurableObject {
       }
 
       const streamHandler = await this.getStreamHandler(sessionIdParam ?? undefined);
-      return streamHandler.handleStreamRequest(request);
+      const response = await streamHandler.handleStreamRequest(request);
+
+      // Request fresh kilo state from wrapper if connected.
+      // The wrapper will respond with regular kilocode events (session.status,
+      // question.asked, permission.asked) that are broadcast via the normal pipeline.
+      this.requestKiloSnapshot();
+
+      return response;
     }
 
     // Route ingest WebSocket (internal only - from queue consumer)
@@ -523,6 +531,28 @@ export class CloudAgentSession extends DurableObject {
     });
   }
 
+  /**
+   * Derive current cloud infrastructure status from execution state.
+   * Used to populate the `connected` event on WebSocket upgrade.
+   */
+  private async deriveCloudStatus(): Promise<CloudStatusData['cloudStatus'] | null> {
+    const activeExecId = await this.executionQueries.getActiveExecutionId();
+    if (!activeExecId) {
+      const metadata = await this.ctx.storage.get<CloudAgentSessionState>('metadata');
+      return metadata?.preparedAt ? { type: 'ready' } : null;
+    }
+
+    const exec = await this.executionQueries.get(activeExecId);
+    if (!exec) return null;
+
+    if (exec.status === 'pending') {
+      return { type: 'preparing' };
+    }
+
+    // Running executions mean the agent has control — infrastructure is ready
+    return { type: 'ready' };
+  }
+
   /**
    * Get count of connected stream clients.
    *
@@ -718,6 +748,19 @@ export class CloudAgentSession extends DurableObject {
     }
   }
 
+  /**
+   * Request fresh kilo state from the wrapper.
+   * The wrapper will respond with regular kilocode events (session.status,
+   * question.asked, permission.asked) that flow through the normal ingest pipeline.
+   * Best-effort: silently does nothing if no wrapper is connected.
+   */
+  private requestKiloSnapshot(): void {
+    void this.executionQueries.getActiveExecutionId().then(activeExecId => {
+      if (!activeExecId) return;
+      this.sendToWrapper(activeExecId, { type: 'request_snapshot' });
+    });
+  }
+
   /**
    * Interrupt the currently active execution by sending a kill command to the wrapper.
    * Returns success/failure status.
@@ -903,12 +946,28 @@ export class CloudAgentSession extends DurableObject {
     const env = this.env as unknown as WorkerEnv;
 
     const emitProgress = (step: PreparingStep, message: string) => {
+      const now = Date.now();
+      // Backward-compatible preparing event
       this.broadcastVolatileEvent({
         executionId: prepExecutionId,
         sessionId: input.sessionId,
         streamEventType: 'preparing',
         payload: JSON.stringify({ step, message }),
-        timestamp: Date.now(),
+        timestamp: now,
+      });
+      // cloud.status event derived from preparation step
+      const cloudStatus =
+        step === 'ready'
+          ? { type: 'ready' as const }
+          : step === 'failed'
+            ? { type: 'error' as const, message }
+            : { type: 'preparing' as const, step, message };
+      this.broadcastVolatileEvent({
+        executionId: prepExecutionId,
+        sessionId: input.sessionId,
+        streamEventType: 'cloud.status',
+        payload: JSON.stringify({ cloudStatus }),
+        timestamp: now,
       });
     };
 
@@ -1193,15 +1252,21 @@ export class CloudAgentSession extends DurableObject {
 
           if (this.sessionId) {
             const prepId: EventSourceId = `prep_${this.sessionId}`;
+            const failNow = Date.now();
+            const failMessage = 'Internal error: invalid preparation data';
             this.broadcastVolatileEvent({
               executionId: prepId,
               sessionId: this.sessionId,
               streamEventType: 'preparing',
-              payload: JSON.stringify({
-                step: 'failed',
-                message: 'Internal error: invalid preparation data',
-              }),
-              timestamp: Date.now(),
+              payload: JSON.stringify({ step: 'failed', message: failMessage }),
+              timestamp: failNow,
+            });
+            this.broadcastVolatileEvent({
+              executionId: prepId,
+              sessionId: this.sessionId,
+              streamEventType: 'cloud.status',
+              payload: JSON.stringify({ cloudStatus: { type: 'error', message: failMessage } }),
+              timestamp: failNow,
             });
           }
         }
@@ -2528,17 +2593,37 @@ export class CloudAgentSession extends DurableObject {
       const orchestrator = this.getOrCreateOrchestrator();
 
       const emitProgress = (step: string, message: string) => {
+        const now = Date.now();
         this.broadcastVolatileEvent({
           executionId,
           sessionId,
           streamEventType: 'preparing',
           payload: JSON.stringify({ step, message }),
-          timestamp: Date.now(),
+          timestamp: now,
+        });
+        // cloud.status mirrors the preparation step
+        this.broadcastVolatileEvent({
+          executionId,
+          sessionId,
+          streamEventType: 'cloud.status',
+          payload: JSON.stringify({
+            cloudStatus: { type: 'preparing' as const, step, message },
+          }),
+          timestamp: now,
         });
       };
 
       const result = await orchestrator.execute(plan, { onProgress: emitProgress });
 
+      // Emit cloud.status = ready after successful execution start
+      this.broadcastVolatileEvent({
+        executionId,
+        sessionId,
+        streamEventType: 'cloud.status',
+        payload: JSON.stringify({ cloudStatus: { type: 'ready' } }),
+        timestamp: Date.now(),
+      });
+
       logger
         .withFields({ sessionId, executionId, kiloSessionId: result.kiloSessionId })
         .info('Execution started successfully');
@@ -2547,6 +2632,14 @@ export class CloudAgentSession extends DurableObject {
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
 
+      this.broadcastVolatileEvent({
+        executionId,
+        sessionId,
+        streamEventType: 'cloud.status',
+        payload: JSON.stringify({ cloudStatus: { type: 'error', message: errorMessage } }),
+        timestamp: Date.now(),
+      });
+
       await this.failExecution({
         executionId,
         status: 'failed',