threadwire 0.1.6 → 0.1.9

package/src/telegram-ingress/config.js

@@ -139,6 +139,7 @@ export async function resolveIngressEnvironment(source, operations = {}) {
  *   host: string,
  *   maxConcurrentWorkers: number,
  *   toolMessages: boolean,
+ *   requireCodexIsolation: boolean,
  *   telegramRequestTimeoutMs: number,
  *   updateIdCapacity: number,
  *   updateIdTtlMs: number
@@ -166,6 +167,9 @@ export function parseIngressConfig(environment) {
     DEFAULT_MAX_CONCURRENT_WORKERS
   )
   const toolMessages = parseStrictBoolean(environment.THREADWIRE_TOOL_MESSAGES, "THREADWIRE_TOOL_MESSAGES", false)
+  const requireCodexIsolation = parseStrictBoolean(
+    environment.THREADWIRE_REQUIRE_CODEX_ISOLATION, "THREADWIRE_REQUIRE_CODEX_ISOLATION", false
+  )
   const telegramRequestTimeoutMs = parseTelegramRequestTimeoutMs(environment)
   const updateIdCapacity = parsePositiveSafeInteger(
     environment.THREADWIRE_UPDATE_ID_CAPACITY,
@@ -187,6 +191,7 @@ export function parseIngressConfig(environment) {
     host,
     maxConcurrentWorkers,
     toolMessages,
+    requireCodexIsolation,
     telegramRequestTimeoutMs,
     updateIdCapacity,
     updateIdTtlMs,
@@ -234,6 +239,19 @@ export function buildProviderEnvironment(source) {
 /** @param {string} key */
 function isIngressSecretKey(key) {
   if (FILE_BACKED_SETTINGS.some((name) => key === `${name}_FILE`)) return true
+  if (key === "THREADWIRE_REQUIRE_CODEX_ISOLATION") return true
+  if (
+    key.startsWith("THREADWIRE_ISOLATED_RUNTIME_")
+    || key.startsWith("THREADWIRE_MODEL_BROKER_")
+    || key.startsWith("THREADWIRE_KIMI_")
+    || key === "KIMI_MODEL_API_KEY"
+    || key === "KIMI_API_KEY"
+    || key === "MOONSHOT_API_KEY"
+    || key === "KIMI_CODE_HOME"
+    || key === "THREADWIRE_RELAY_WORKER_IMAGE"
+    || key === "THREADWIRE_ALLOWED_WORKTREE_ROOTS"
+    || key === "THREADWIRE_WORKTREE_VOLUME"
+  ) return true
   return key === "TELEGRAM_BOT_TOKEN" ||
     key === "THREADWIRE_TELEGRAM_BOT_TOKEN" ||
     key === "THREADWIRE_WEBHOOK_SECRET" ||

package/src/telegram-ingress/core.js

@@ -6,6 +6,7 @@ import {NoticeQueue} from "../notice-queue.js"
 import {createFetchTransport} from "../notifiers/fetch-transport.js"
 import {createTelegramSender} from "../notifiers/telegram.js"
 import {createProvider} from "../providers/index.js"
+import {kimiSessionEnvelopeId} from "../providers/kimi.js"
 import {Relay} from "../relay.js"
 import {runWorker} from "../run-worker.js"
 import {WorkerControl} from "../worker-control.js"
@@ -15,7 +16,7 @@ import {parseCodeCommand, parseEvidenceCommand} from "./command.js"
 
 /**
  * @typedef {{platform: "telegram", chatId: string, threadId: number | null}} TelegramTarget
- * @typedef {{provider: "codex" | "claude" | "opencode", prompt: string, target: TelegramTarget, senderId: string} | {type: "evidence", request: unknown, target: TelegramTarget, senderId: string}} AcceptedJob
+ * @typedef {{provider: "codex" | "claude" | "kimi" | "opencode", prompt: string, target: TelegramTarget, senderId: string} | {type: "evidence", request: unknown, target: TelegramTarget, senderId: string}} AcceptedJob
  * @typedef {{
  *   createProvider?: typeof createProvider,
  *   createFetchTransport?: typeof createFetchTransport,
@@ -29,6 +30,8 @@ import {parseCodeCommand, parseEvidenceCommand} from "./command.js"
  *   workspaceProfileOperations?: import("../workspace-profile.js").WorkspaceProfileOperations,
  *   activity?: Pick<import("../activity-log.js").ActivityLog, "recordWorkspace" | "recordStarted" | "recordSession" | "close">,
  *   evidenceStore?: import("../evidence-store.js").EvidenceStore,
+ *   isolatedRuntimeClient?: Pick<import("../isolated-runtime-client.js").IsolatedRuntimeClient, "preflight" | "run">,
+ *   kimiIsolatedRuntimeClient?: Pick<import("../isolated-runtime-client.js").IsolatedRuntimeClient, "preflight" | "run">,
  *   onWorkerFailure?: (message: string) => void,
  *   onWorkerSettled?: () => void
  * }} IngressDependencies
@@ -87,12 +90,19 @@ export function interpretUpdate(update, config) {
  * spawn rejects (HTTP 500). Failure after spawn is observed via
  * onWorkerFailure without empty-swallowing the error.
  * @param {AcceptedJob} job
- * @param {{botToken: string, telegramRequestTimeoutMs?: number, toolMessages?: boolean}} config
+ * @param {{botToken: string, telegramRequestTimeoutMs?: number, toolMessages?: boolean, requireCodexIsolation?: boolean}} config
  * @param {IngressDependencies} [dependencies]
  * @returns {Promise<void>}
  */
 export async function dispatchWorker(job, config, dependencies = {}) {
   if ("type" in job) throw new Error("Worker dispatch requires a worker job")
+  if (job.provider === "kimi" && dependencies.kimiIsolatedRuntimeClient === undefined) {
+    throw new Error("Kimi isolated runtime is required")
+  }
+  if (job.provider === "codex" && config.requireCodexIsolation === true
+    && dependencies.isolatedRuntimeClient === undefined) {
+    throw new Error("Codex isolated runtime is required")
+  }
   const createProviderImpl = dependencies.createProvider ?? createProvider
   const createFetchTransportImpl = dependencies.createFetchTransport ?? createFetchTransport
   const createTelegramSenderImpl = dependencies.createTelegramSender ?? createTelegramSender
@@ -107,6 +117,18 @@ export async function dispatchWorker(job, config, dependencies = {}) {
     {provider: job.provider},
     dependencies.workspaceProfileOperations
   )
+  const isolatedRuntimeClient = job.provider === "kimi"
+    ? dependencies.kimiIsolatedRuntimeClient
+    : job.provider === "codex" ? dependencies.isolatedRuntimeClient : undefined
+  const earlyKimiPreflight = job.provider === "kimi"
+    ? await /** @type {NonNullable<typeof isolatedRuntimeClient>} */ (isolatedRuntimeClient).preflight({
+      provider: "kimi",
+      profile: workspace.profile,
+      repositoryRoot: workspace.repositoryRoot,
+      cwd: workspace.cwd,
+      providerArguments: []
+    })
+    : undefined
 
   const provider = createProviderImpl(job.provider, [], job.prompt, undefined, providerEnvironment)
   dependencies.activity?.recordWorkspace(
@@ -136,6 +158,47 @@ export async function dispatchWorker(job, config, dependencies = {}) {
   try {
     await evidence?.append("prompt", `prompt\n${job.prompt}\nprovider-stream\n`)
 
+    if (isolatedRuntimeClient !== undefined) {
+      evidenceTransferred = true
+      try {
+        const preflight = earlyKimiPreflight ?? await isolatedRuntimeClient.preflight({
+          provider: job.provider,
+          profile: workspace.profile,
+          repositoryRoot: workspace.repositoryRoot,
+          cwd: workspace.cwd,
+          providerArguments: []
+        })
+        const exitCode = await isolatedRuntimeClient.run({
+          preflightId: preflight.preflightId,
+          prompt: job.prompt,
+          providerArguments: [],
+          ...(preflight.deadline === undefined ? {} : {deadline: preflight.deadline}),
+          onEvent: async (event) => control.accept(event),
+          onRecord: async (record) => {
+            const id = job.provider === "kimi" ? kimiSessionEnvelopeId(record) : provider.sessionId(record)
+            if (id !== undefined) dependencies.activity?.recordSession(provider.name, id)
+          },
+          ...(job.provider === "kimi" ? {} : {
+            onStdoutChunk: (chunk) => evidence?.append("provider-stdout", chunk),
+            onStderrChunk: (chunk) => evidence?.append("provider-stderr", chunk)
+          })
+        })
+        if (exitCode !== 0) throw new Error(`Isolated ${job.provider === "kimi" ? "Kimi" : "Codex"} worker exited with status ${exitCode}`)
+        await control.close()
+        if (evidence !== undefined) {
+          await evidence.finalize()
+          await sender.send(`Evidence: ${evidence.handle}`)
+        }
+        return
+      } catch (error) {
+        await control.close().catch(() => {})
+        await evidence?.abort()
+        throw error
+      } finally {
+        dependencies.onWorkerSettled?.()
+      }
+    }
+
     /** @type {{resolve: () => void, reject: (error: Error) => void, settled: boolean}} */
     const spawnGate = {
       settled: false,

package/src/telegram-ingress/http.js

@@ -145,7 +145,8 @@ async function handleRequest(request, response, config, dependencies) {
       await dispatchWorker(job, {
         botToken: config.botToken,
         telegramRequestTimeoutMs: config.telegramRequestTimeoutMs,
-        toolMessages: config.toolMessages
+        toolMessages: config.toolMessages,
+        requireCodexIsolation: config.requireCodexIsolation
       }, {
         ...dependencies,
         onWorkerSettled: () => {

package/src/telegram-webhook.js

@@ -5,6 +5,7 @@ import {ActivityLog} from "./activity-log.js"
 import {EvidenceStore} from "./evidence-store.js"
 import {buildProviderEnvironment, parseIngressConfig, resolveIngressEnvironment} from "./telegram-ingress/config.js"
 import {createWebhookHandler} from "./telegram-ingress/http.js"
+import {isolatedRuntimeClientFromEnvironment, kimiIsolatedRuntimeClientFromEnvironment} from "./isolated-runtime-client.js"
 
 /**
  * Start the standalone Threadwire Telegram webhook service.
@@ -34,6 +35,14 @@ export async function startTelegramWebhook(options = {}) {
   const providerEnvironment = buildProviderEnvironment(
     options.providerEnvironment ?? environment
   )
+  const isolatedConfigured = typeof environment.THREADWIRE_ISOLATED_RUNTIME_CONTROL_TOKEN === "string"
+    && environment.THREADWIRE_ISOLATED_RUNTIME_CONTROL_TOKEN.trim().length > 0
+  const isolatedRuntimeClient = options.handlerDependencies?.isolatedRuntimeClient
+    ?? (isolatedConfigured ? isolatedRuntimeClientFromEnvironment(environment) : undefined)
+  const kimiIsolatedConfigured = typeof environment.THREADWIRE_KIMI_ISOLATED_RUNTIME_CONTROL_TOKEN === "string"
+    && environment.THREADWIRE_KIMI_ISOLATED_RUNTIME_CONTROL_TOKEN.trim().length > 0
+  const kimiIsolatedRuntimeClient = options.handlerDependencies?.kimiIsolatedRuntimeClient
+    ?? (kimiIsolatedConfigured ? kimiIsolatedRuntimeClientFromEnvironment(environment) : undefined)
   const activity = options.activity ?? options.handlerDependencies?.activity ?? new ActivityLog("/var/lib/threadwire/activity/threadwire.jsonl")
   const evidenceStore = options.evidenceStore ?? options.handlerDependencies?.evidenceStore ?? await EvidenceStore.open({
     root: config.evidenceRoot ?? "/var/lib/threadwire/evidence"
@@ -44,6 +53,8 @@ export async function startTelegramWebhook(options = {}) {
     activity,
     evidenceStore,
     providerEnvironment,
+    ...(isolatedRuntimeClient === undefined ? {} : {isolatedRuntimeClient}),
+    ...(kimiIsolatedRuntimeClient === undefined ? {} : {kimiIsolatedRuntimeClient}),
     onOperationalError,
     onWorkerFailure
   })

package/src/workspace-profile.js

@@ -14,7 +14,7 @@ const SOURCE_IDENTITY_PATTERN = /^[0-9a-f]{40}$|^[0-9a-f]{64}$/u
 const PROFILE_NAME_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/u
 
 /**
- * @typedef {{repositoryRoot: string, cwd: string, providers: ("codex" | "claude" | "opencode")[]}} WorkspaceProfile
+ * @typedef {{repositoryRoot: string, cwd: string, providers: ("codex" | "claude" | "kimi" | "opencode")[]}} WorkspaceProfile
  * @typedef {{version: 1, defaultProfile: string, profiles: Record<string, WorkspaceProfile>}} WorkspaceProfilesConfig
  * @typedef {{profile: string, repositoryRoot: string, cwd: string, revision: string, sourceIdentity: string}} ResolvedWorkspaceProfile
  * @typedef {{repositoryRoot: string, revision: string, sourceIdentity: string}} GitProvenance
@@ -52,7 +52,7 @@ export function parseWorkspaceProfiles(value) {
 
 /**
  * Resolve a reviewed workspace profile to a validated in-container workspace.
- * @param {{provider: "codex" | "claude" | "opencode", profile?: string}} selection
+ * @param {{provider: "codex" | "claude" | "kimi" | "opencode", profile?: string}} selection
  * @param {WorkspaceProfileOperations} [operations]
  * @returns {Promise<ResolvedWorkspaceProfile>}
  */
@@ -137,7 +137,7 @@ async function readSourceIdentity(repositoryRoot, cwd) {
 /** @param {unknown} value */
 function parseProviders(value) {
   if (!Array.isArray(value) || value.length === 0) throw new Error("Workspace profile configuration is invalid")
-  /** @type {("codex" | "claude" | "opencode")[]} */
+  /** @type {("codex" | "claude" | "kimi" | "opencode")[]} */
   const providers = []
   for (const entry of value) {
     if (typeof entry !== "string") {

package/threadwire.workspace-profiles.json

@@ -5,7 +5,7 @@
     "container-runtime": {
       "repositoryRoot": "/workspace/threadwire",
       "cwd": "/workspace/threadwire",
-      "providers": ["codex"]
+      "providers": ["codex", "kimi"]
     }
   }
 }