u-foo 2.5.8 → 2.5.9

package/src/code/nativeRunner.js

@@ -1,5 +1,9 @@
 const { randomUUID } = require("crypto");
 const { loadConfig, defaultAgentModelForProvider, sameModelProvider } = require("../config");
+const {
+  readKimiAccessToken,
+  resolveKimiUpstreamCredentials,
+} = require("../agents/providers/credentials/kimi");
 const { runToolCall } = require("./dispatch");
 const { getReadToolDescription } = require("../agents/prompts/native/toolDescriptions/read");
 const { getWriteToolDescription } = require("../agents/prompts/native/toolDescriptions/write");
@@ -9,6 +13,8 @@ const { getBashToolDescription } = require("../agents/prompts/native/toolDescrip
 const CORE_TOOL_NAMES = new Set(["read", "write", "edit", "bash"]);
 const DEFAULT_OPENAI_BASE_URL = "https://api.openai.com/v1";
 const DEFAULT_ANTHROPIC_BASE_URL = "https://api.anthropic.com/v1";
+const DEFAULT_KIMI_BASE_URL = "https://api.kimi.com/coding/v1";
+const DEFAULT_KIMI_MODEL = "k3";
 // Claude Code SDK defaults to no turn limit; built-in agents cap at 30 (DreamTask)
 // to 200 (fork). We count individual tool calls (not turns), so 100 leaves headroom
 // for non-trivial tasks while still catching runaway loops. Override via env.
@@ -107,6 +113,7 @@ function normalizeProvider(value = "") {
   if (!text) return "";
   if (text === "codex" || text === "codex-cli" || text === "codex-code") return "openai";
   if (text === "claude" || text === "claude-cli" || text === "claude-code") return "anthropic";
+  if (text === "kimi" || text === "kimi-code" || text === "moonshot") return "kimi";
   if (text === "openai" || text === "anthropic") return text;
   return text;
 }
@@ -116,6 +123,7 @@ function resolveTransport({ provider = "", baseUrl = "" } = {}) {
   const url = String(baseUrl || "").trim().toLowerCase();
 
   if (normalizedProvider === "anthropic") return "anthropic-messages";
+  if (normalizedProvider === "kimi") return "openai-chat";
   if (url.includes("anthropic.com")) return "anthropic-messages";
   if (/\/messages(?:$|[/?#])/.test(url) && !/\/chat\/completions(?:$|[/?#])/.test(url)) {
     return "anthropic-messages";
@@ -141,12 +149,14 @@ function resolveRuntimeConfig({ workspaceRoot = process.cwd(), provider = "", mo
     model
       || process.env.UFOO_UCODE_MODEL
       || configuredModel
-      || defaultAgentModelForProvider(selectedProvider)
+      || (selectedProvider === "kimi" ? DEFAULT_KIMI_MODEL : defaultAgentModelForProvider(selectedProvider))
   ).trim();
 
   const defaultBaseUrl = selectedProvider === "anthropic"
     ? String(process.env.ANTHROPIC_BASE_URL || DEFAULT_ANTHROPIC_BASE_URL)
-    : String(process.env.OPENAI_BASE_URL || DEFAULT_OPENAI_BASE_URL);
+    : selectedProvider === "kimi"
+      ? DEFAULT_KIMI_BASE_URL
+      : String(process.env.OPENAI_BASE_URL || DEFAULT_OPENAI_BASE_URL);
 
   const baseUrl = String(
     process.env.UFOO_UCODE_BASE_URL
@@ -154,19 +164,38 @@ function resolveRuntimeConfig({ workspaceRoot = process.cwd(), provider = "", mo
       || defaultBaseUrl
   ).trim();
 
-  const apiKey = String(
+  const explicitApiKey = String(
     process.env.UFOO_UCODE_API_KEY
       || config.ucodeApiKey
-      || (selectedProvider === "openai" ? process.env.OPENAI_API_KEY : "")
-      || (selectedProvider === "anthropic" ? process.env.ANTHROPIC_API_KEY : "")
       || ""
   ).trim();
+  let apiKey = explicitApiKey;
+  let apiKeySource = explicitApiKey ? "explicit" : "";
+  let kimiCredentialState = "";
+  if (!apiKey && selectedProvider === "kimi") {
+    const credential = readKimiAccessToken({ env: process.env });
+    if (credential && credential.accessToken) {
+      apiKey = String(credential.accessToken).trim();
+      apiKeySource = "kimi-credential";
+      kimiCredentialState = String(credential.state || "");
+    }
+  }
+  if (!apiKey) {
+    apiKey = String(
+      (selectedProvider === "openai" ? process.env.OPENAI_API_KEY : "")
+        || (selectedProvider === "anthropic" ? process.env.ANTHROPIC_API_KEY : "")
+        || ""
+    ).trim();
+    if (apiKey) apiKeySource = "env";
+  }
 
   return {
     provider: selectedProvider,
     model: selectedModel,
     baseUrl,
     apiKey,
+    apiKeySource,
+    kimiCredentialState,
     transport: resolveTransport({ provider: selectedProvider, baseUrl }),
   };
 }
@@ -532,6 +561,7 @@ async function runOpenAiLikeTurn({
   url = "",
   apiKey = "",
   model = "",
+  provider = "",
   messages = [],
   onTextDelta = null,
   onThinkingDelta = null,
@@ -546,7 +576,8 @@ async function runOpenAiLikeTurn({
     tools: buildCoreToolSpecs(),
     tool_choice: "auto",
     stream: true,
-    temperature: 0,
+    // Kimi k3 rejects any temperature other than 1.
+    temperature: normalizeProvider(provider) === "kimi" ? 1 : 0,
   };
 
   const headers = {
@@ -1075,6 +1106,7 @@ async function runNativeLoop({
   model = "",
   baseUrl = "",
   apiKey = "",
+  provider = "",
   timeoutMs = 300000,
   onStreamDelta = null,
   onThinkingDelta = null,
@@ -1109,6 +1141,7 @@ async function runNativeLoop({
       url: requestUrl,
       apiKey,
       model: requestModel,
+      provider,
       systemPrompt,
       messages,
       signal,
@@ -1235,6 +1268,23 @@ async function runNativeAgentTask({
       model,
     });
 
+    // Kimi tokens expire; resolveRuntimeConfig reads the credential file
+    // synchronously, so refresh it here (async) when the key came from that
+    // file and the token is outside the fresh window.
+    if (
+      runtime.provider === "kimi"
+      && runtime.apiKeySource === "kimi-credential"
+      && runtime.kimiCredentialState !== "fresh"
+    ) {
+      try {
+        const credential = await resolveKimiUpstreamCredentials({ env: process.env });
+        const token = String(credential && credential.accessToken || "").trim();
+        if (token) runtime.apiKey = token;
+      } catch {
+        // Keep the file token; the request itself will surface auth failures.
+      }
+    }
+
     const transport = TRANSPORTS[runtime.transport] || TRANSPORTS["openai-chat"];
 
     const runResult = await runNativeLoop({
@@ -1246,6 +1296,7 @@ async function runNativeAgentTask({
       model: runtime.model,
       baseUrl: runtime.baseUrl,
       apiKey: runtime.apiKey,
+      provider: runtime.provider,
       timeoutMs,
       onStreamDelta: trackingStreamDelta,
       onThinkingDelta,

package/src/config.js

@@ -13,11 +13,15 @@ const SETTINGS_MODEL_DEFAULTS = Object.freeze({
     // command-line flag for model, so the value here is a placeholder for
     // display; we never pass it on the agy command line.
     agy: "",
+    // kimi reads its model from its own config.toml (default_model); ufoo
+    // never injects -m/--model, so keep the placeholder empty like agy.
+    kimi: "",
   }),
   router: Object.freeze({
     codex: "gpt-5.3-codex-spark",
     claude: "sonnet-4.7",
     agy: "",
+    kimi: "",
   }),
 });
 
@@ -57,6 +61,7 @@ function normalizeLaunchMode(value) {
 function normalizeAgentProvider(value) {
   if (value === "claude-cli") return "claude-cli";
   if (value === "agy-cli" || value === "agy" || value === "antigravity") return "agy-cli";
+  if (value === "kimi-cli" || value === "kimi") return "kimi-cli";
   return "codex-cli";
 }
 
@@ -64,6 +69,7 @@ function providerKey(value = "") {
   const text = String(value || "").trim().toLowerCase();
   if (text === "claude" || text === "claude-cli" || text === "claude-code" || text === "anthropic") return "claude";
   if (text === "agy" || text === "agy-cli" || text === "antigravity") return "agy";
+  if (text === "kimi" || text === "kimi-cli" || text === "kimi-code") return "kimi";
   return "codex";
 }
 
@@ -81,6 +87,8 @@ function defaultRouterProviderForAgentProvider(value = "") {
   // agy has no router-model API; fall back to codex (the controller still
   // routes via codex/claude regardless of which agent provider runs).
   if (key === "agy") return "codex";
+  // kimi likewise manages its own models; router falls back to codex.
+  if (key === "kimi") return "codex";
   return "codex";
 }
 

package/src/orchestration/groups/validateTemplate.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const ALLOWED_AGENT_TYPES = new Set(["auto", "codex", "claude", "ucode", "agy"]);
+const ALLOWED_AGENT_TYPES = new Set(["auto", "codex", "claude", "ucode", "agy", "kimi"]);
 const { resolvePromptProfileReference } = require("./promptProfiles");
 
 function isPlainObject(value) {

package/src/runtime/daemon/groupOrchestrator.js

@@ -310,6 +310,7 @@ function resolveAutoAgentType(projectRoot, requestedType) {
   if (provider === "claude-cli") return "claude";
   if (provider === "ucode") return "ucode";
   if (provider === "agy-cli") return "agy";
+  if (provider === "kimi-cli") return "kimi";
   return "codex";
 }
 
@@ -397,6 +398,8 @@ function buildExecutionPlan({
             // not via post-launch injection.
             : (resolvedType === "agy"
               ? "initial-prompt-arg"
+              // Kimi has no initial-prompt flag, so it falls through to
+              // post-launch PTY injection like any other future type.
               : "post-launch-inject"))));
     const bootstrapPrompt = bootstrapRequired
       ? composeGroupBootstrapPrompt({
@@ -923,6 +926,9 @@ function createGroupOrchestrator(options = {}) {
       // Agy uses the same "send bootstrap as a launch flag" model, but its
       // flag is `-i <text>` (alias for --prompt-interactive). Same strategy
       // key, different arg shape.
+      //
+      // Kimi never enters this branch: it has no initial-prompt flag, so its
+      // bootstrap strategy is post-launch-inject (handled further below).
       if (item.bootstrap_strategy === "initial-prompt-arg") {
         member.bootstrap_attempted_at = nowIso();
         member.bootstrap_error = "";

package/src/runtime/daemon/index.js

@@ -62,6 +62,7 @@ function normalizeBusAgentType(agentType = "") {
   if (value === "codex") return "codex";
   if (value === "claude" || value === "claude-code") return "claude-code";
   if (value === "agy" || value === "antigravity") return "agy";
+  if (value === "kimi" || value === "kimi-cli" || value === "kimi-code") return "kimi";
   if (value === "ufoo" || value === "ucode" || value === "ufoo-code") return "ufoo-code";
   return value;
 }
@@ -71,6 +72,7 @@ function normalizeLaunchAgent(agent = "") {
   if (value === "codex") return "codex";
   if (value === "claude" || value === "claude-code") return "claude";
   if (value === "agy" || value === "antigravity") return "agy";
+  if (value === "kimi" || value === "kimi-cli" || value === "kimi-code") return "kimi";
   if (value === "ufoo" || value === "ucode" || value === "ufoo-code") return "ufoo";
   return "";
 }
@@ -1685,9 +1687,9 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
             : null,
       };
       let soloLaunchBootstrap = null;
-      if (requestedProfile && (normalizedAgent === "ufoo" || normalizedAgent === "claude" || normalizedAgent === "codex" || normalizedAgent === "agy")) {
-        const agentTypeMap = { ufoo: "ufoo-code", claude: "claude-code", codex: "codex", agy: "agy" };
-        const defaultNickMap = { ufoo: "ucode", claude: "claude", codex: "codex", agy: "agy" };
+      if (requestedProfile && (normalizedAgent === "ufoo" || normalizedAgent === "claude" || normalizedAgent === "codex" || normalizedAgent === "agy" || normalizedAgent === "kimi")) {
+        const agentTypeMap = { ufoo: "ufoo-code", claude: "claude-code", codex: "codex", agy: "agy", kimi: "kimi" };
+        const defaultNickMap = { ufoo: "ucode", claude: "claude", codex: "codex", agy: "agy", kimi: "kimi" };
         const agentTypeForBootstrap = agentTypeMap[normalizedAgent];
         const soloNickname = explicitNickname || defaultNickMap[normalizedAgent];
         const profileResult = resolveSoloPromptProfile(projectRoot, requestedProfile);
@@ -1738,6 +1740,13 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
                 ...(Array.isArray(op.extra_args) ? op.extra_args : []),
                 "-i", built.promptText,
               ];
+            } else if (normalizedAgent === "kimi") {
+              // kimi: no initial-prompt flag — deliver the bootstrap through
+              // the launcher's post-launch PTY injection instead.
+              op.extra_env = {
+                ...(op.extra_env && typeof op.extra_env === "object" ? op.extra_env : {}),
+                UFOO_STARTUP_BOOTSTRAP_TEXT: built.promptText,
+              };
             }
             soloLaunchBootstrap = {
               requested_profile: profileResult.requested_profile,

package/src/runtime/daemon/ops.js

@@ -22,6 +22,7 @@ function normalizeLaunchAgent(agent = "") {
   if (value === "codex") return "codex";
   if (value === "claude" || value === "claude-code") return "claude";
   if (value === "agy" || value === "antigravity") return "agy";
+  if (value === "kimi" || value === "kimi-cli" || value === "kimi-code") return "kimi";
   if (value === "ufoo" || value === "ucode" || value === "ufoo-code") return "ufoo";
   return "";
 }
@@ -30,6 +31,7 @@ function toBusAgentType(agent = "") {
   if (agent === "codex") return "codex";
   if (agent === "claude") return "claude-code";
   if (agent === "agy") return "agy";
+  if (agent === "kimi") return "kimi";
   if (agent === "ufoo") return "ufoo-code";
   return "";
 }
@@ -38,6 +40,7 @@ function toTerminalBinary(agent = "") {
   if (agent === "codex") return "ucodex";
   if (agent === "claude") return "uclaude";
   if (agent === "agy") return "uagy";
+  if (agent === "kimi") return "ukimi";
   if (agent === "ufoo") return "ucode";
   return "";
 }
@@ -46,6 +49,7 @@ function toTmuxBinary(agent = "") {
   if (agent === "codex") return "ucodex";
   if (agent === "claude") return "uclaude";
   if (agent === "agy") return "uagy";
+  if (agent === "kimi") return "ukimi";
   if (agent === "ufoo") return "ucode";
   return "";
 }
@@ -1100,6 +1104,8 @@ function buildResumeArgs(agent, sessionId) {
   // Agy resumes by conversation UUID; bin/uagy.js de-duplicates if the same
   // flag is already injected via provider_session_id readback.
   if (agent === "agy") return [`--conversation=${sessionId}`];
+  // kimi resumes a session by id via `-S, --session <id>`.
+  if (agent === "kimi") return ["--session", sessionId];
   return [];
 }
 
@@ -1152,7 +1158,7 @@ function collectRecoverableAgents(projectRoot, target = "") {
       continue;
     }
     const agent = normalizeAgentType(meta.agent_type);
-    if (agent !== "codex" && agent !== "claude" && agent !== "agy") {
+    if (agent !== "codex" && agent !== "claude" && agent !== "agy" && agent !== "kimi") {
       skipped.push({ id, reason: "unsupported agent type" });
       continue;
     }

package/src/runtime/daemon/providerSessions.js

@@ -113,9 +113,44 @@ function resolveCodexSessionFromFile(cwd) {
   }
 }
 
+/**
+ * Resolve Kimi Code session ID from the session index.
+ * Kimi writes $KIMI_CODE_HOME/session_index.jsonl (default ~/.kimi-code/)
+ * with one JSON line per session: { sessionId, sessionDir, workDir }.
+ * The file is append-only, so the last line matching the cwd is the most
+ * recent session for that directory.
+ */
+function resolveKimiSessionFromIndex(cwd) {
+  if (!cwd) return null;
+  try {
+    const kimiHome = String(process.env.KIMI_CODE_HOME || "").trim()
+      || path.join(os.homedir(), ".kimi-code");
+    const indexPath = path.join(kimiHome, "session_index.jsonl");
+    if (!fs.existsSync(indexPath)) return null;
+    const lines = fs.readFileSync(indexPath, "utf8").split("\n");
+    for (let i = lines.length - 1; i >= 0; i -= 1) {
+      const line = lines[i].trim();
+      if (!line) continue;
+      try {
+        const record = JSON.parse(line);
+        const sessionId = record.sessionId || record.session_id || "";
+        const workDir = record.workDir || record.work_dir || record.cwd || "";
+        if (sessionId && workDir === cwd) {
+          return { sessionId, source: indexPath };
+        }
+      } catch {
+        continue;
+      }
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+
 /**
  * Resolve provider session ID directly from session files.
- * @param {string} agentType - "claude-code" or "codex"
+ * @param {string} agentType - "claude-code", "codex" or "kimi"
  * @param {object} opts - { pid, cwd }
  */
 function resolveSessionFromFile(agentType, opts = {}) {
@@ -125,6 +160,9 @@ function resolveSessionFromFile(agentType, opts = {}) {
   if (agentType === "codex") {
     return resolveCodexSessionFromFile(opts.cwd);
   }
+  if (agentType === "kimi") {
+    return resolveKimiSessionFromIndex(opts.cwd);
+  }
   return null;
 }
 
@@ -169,7 +207,7 @@ function scheduleProviderSessionResolve({
   onResolved = null,
 }) {
   if (!subscriberId || !agentType) return null;
-  if (agentType !== "codex" && agentType !== "claude-code") return null;
+  if (agentType !== "codex" && agentType !== "claude-code" && agentType !== "kimi") return null;
 
   let executed = false;
   let cancelled = false;
@@ -226,5 +264,6 @@ module.exports = {
   __private: {
     resolveClaudeSessionFromFile,
     resolveCodexSessionFromFile,
+    resolveKimiSessionFromIndex,
   },
 };

package/src/tools/schemaFixtures.js

@@ -456,7 +456,7 @@ const LAUNCH_AGENT_SCHEMA = Object.freeze({
     properties: Object.freeze({
       agent: Object.freeze({
         type: "string",
-        enum: Object.freeze(["codex", "claude", "ucode", "agy"]),
+        enum: Object.freeze(["codex", "claude", "ucode", "agy", "kimi"]),
       }),
       count: Object.freeze({ type: "integer", minimum: 1 }),
       nickname: Object.freeze({ type: "string" }),

package/src/ui/format/index.js

@@ -16,9 +16,21 @@ const UCODE_BANNER_LINES = [
 
 const UCODE_VERSION = String((pkg && pkg.version) || "dev");
 
+// Flying-saucer patrol for busy/loading states: the 🛸 drifts left-right
+// inside a fixed 6-cell field (three emoji slots), so the status text after
+// it stays anchored instead of shifting with the saucer.
+const UFO_FIELD_CELLS = 6;
+const UFO_FRAMES = [];
+for (let i = 0; i <= UFO_FIELD_CELLS - 2; i += 1) {
+  UFO_FRAMES.push(`${" ".repeat(i)}🛸${" ".repeat(UFO_FIELD_CELLS - 2 - i)}`);
+}
+for (let i = UFO_FIELD_CELLS - 3; i > 0; i -= 1) {
+  UFO_FRAMES.push(`${" ".repeat(i)}🛸${" ".repeat(UFO_FIELD_CELLS - 2 - i)}`);
+}
+
 const STATUS_INDICATORS = {
-  thinking: ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"],
-  typing: ["◐", "◓", "◑", "◒"],
+  thinking: UFO_FRAMES,
+  typing: UFO_FRAMES,
   waiting: ["∙", "∙∙", "∙∙∙", "∙∙", "∙"],
 };