kimiflare 0.13.1 → 0.13.2

package/dist/index.js

@@ -782,7 +782,7 @@ How to work:
 - You have a 262k-token context window. Read as much of a file as needed rather than guessing.
 - If a request is ambiguous, ask one focused question instead of making large assumptions.
 - When you finish a task, stop. Do not add a closing summary.
-- When creating git commits, you may include \`Co-authored-by: kimiflare <kimiflare@proton.me>\` in the commit message so kimiflare is credited as a contributor. The bash tool will also auto-append this trailer when it detects \`git commit\` commands.`;
+- When creating git commits, you must include \`Co-authored-by: kimiflare <kimiflare@proton.me>\` in the commit message so kimiflare is credited as a contributor. The bash tool will also auto-append this trailer when it detects git commit-creating commands.`;
   const ctx = loadContextFile(opts2.cwd);
   const contextBlock = ctx ? `
 
@@ -977,6 +977,8 @@ var init_edit = __esm({
 
 // src/tools/bash.ts
 import { spawn } from "child_process";
+import { tmpdir } from "os";
+import { join as join3 } from "path";
 function formatBashTitle(raw) {
   let cmd = (raw ?? "").trim();
   const m = cmd.match(/^cd\s+([^\s&;]+)\s*(?:&&|;)\s*(.*)$/);
@@ -987,13 +989,28 @@ function injectCoauthor(command, coauthor) {
   if (!coauthor) return command;
   const trailer = `Co-authored-by: ${coauthor.name} <${coauthor.email}>`;
   const trimmed = command.trim();
-  if (!/\bgit\s+commit\b/.test(trimmed)) return command;
   if (command.includes(trailer)) return command;
-  if (/\b(--dry-run|-n)\b/.test(trimmed) && !/-m\b|--message\b/.test(trimmed)) return command;
-  const tmpFile = `/tmp/kf-coauthor-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-  const check = `! git log -1 --pretty=%B 2>/dev/null | grep -qF "${trailer}"`;
-  const append = `git log -1 --pretty=%B | git interpret-trailers --trailer "${trailer}" > "${tmpFile}" && git commit --amend -F "${tmpFile}" --no-edit && rm -f "${tmpFile}"`;
-  return `(${command}) && ${check} && ${append}`;
+  const createsCommit = /\bgit\s+(commit|merge|revert|cherry-pick)\b/.test(trimmed);
+  const isRebaseContinue = /\bgit\s+rebase\b/.test(trimmed) && !/\b--abort\b|\b--skip\b/.test(trimmed);
+  const mentionsGit = /\bgit\b/.test(trimmed);
+  if (!createsCommit && !isRebaseContinue && !mentionsGit) return command;
+  const tmpFile = join3(tmpdir(), `kf-coauthor-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`);
+  const amendBlock = `
+    if ! git log -1 --pretty=%B 2>/dev/null | grep -qF "${trailer}"; then
+      git log -1 --pretty=%B | git interpret-trailers --trailer "${trailer}" > "${tmpFile}" && git commit --amend -F "${tmpFile}" --no-edit && rm -f "${tmpFile}"
+    fi
+  `.trim();
+  if (createsCommit || isRebaseContinue) {
+    return `(${command}) && { ${amendBlock}; }`;
+  }
+  const beforeHead = `git rev-parse HEAD 2>/dev/null || echo "NO_HEAD"`;
+  const afterCheck = `
+    _KF_AFTER_HEAD=$(git rev-parse HEAD 2>/dev/null || echo "NO_HEAD")
+    if [ "$_KF_BEFORE_HEAD" != "$_KF_AFTER_HEAD" ] && [ "$_KF_AFTER_HEAD" != "NO_HEAD" ]; then
+      ${amendBlock}
+    fi
+  `.trim();
+  return `_KF_BEFORE_HEAD=$(${beforeHead}); (${command}); _KF_EXIT=$?; [ $_KF_EXIT -eq 0 ] && { ${afterCheck}; }; exit $_KF_EXIT`;
 }
 function runBash(args, ctx) {
   const timeout = Math.min(Math.max(1e3, args.timeout_ms ?? DEFAULT_TIMEOUT), MAX_TIMEOUT);
@@ -1437,16 +1454,16 @@ var init_executor = __esm({
 // src/util/update-check.ts
 import { readFile as readFile6, writeFile as writeFile4, mkdir as mkdir3, access } from "fs/promises";
 import { homedir as homedir4 } from "os";
-import { join as join3, dirname as dirname2 } from "path";
+import { join as join4, dirname as dirname2 } from "path";
 import { fileURLToPath } from "url";
 function cachePath() {
-  const xdg = process.env.XDG_CONFIG_HOME || join3(homedir4(), ".config");
-  return join3(xdg, "kimiflare", "update-check.json");
+  const xdg = process.env.XDG_CONFIG_HOME || join4(homedir4(), ".config");
+  return join4(xdg, "kimiflare", "update-check.json");
 }
 async function findPackageJson(startDir) {
   let dir = startDir;
   while (true) {
-    const candidate = join3(dir, "package.json");
+    const candidate = join4(dir, "package.json");
     try {
       const raw = await readFile6(candidate, "utf8");
       const parsed = JSON.parse(raw);
@@ -1530,7 +1547,7 @@ async function isGitRepo() {
   let dir = dirname2(fileURLToPath(import.meta.url));
   while (true) {
     try {
-      await access(join3(dir, ".git"));
+      await access(join4(dir, ".git"));
       return true;
     } catch {
     }
@@ -3481,10 +3498,10 @@ var init_theme = __esm({
 // src/sessions.ts
 import { readFile as readFile7, writeFile as writeFile5, mkdir as mkdir4, readdir, stat as stat2 } from "fs/promises";
 import { homedir as homedir5 } from "os";
-import { join as join4 } from "path";
+import { join as join5 } from "path";
 function sessionsDir() {
-  const xdg = process.env.XDG_DATA_HOME || join4(homedir5(), ".local", "share");
-  return join4(xdg, "kimiflare", "sessions");
+  const xdg = process.env.XDG_DATA_HOME || join5(homedir5(), ".local", "share");
+  return join5(xdg, "kimiflare", "sessions");
 }
 function sanitize(text) {
   return text.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 40);
@@ -3497,7 +3514,7 @@ function makeSessionId(firstPrompt) {
 async function saveSession(file) {
   const dir = sessionsDir();
   await mkdir4(dir, { recursive: true });
-  const path = join4(dir, `${file.id}.json`);
+  const path = join5(dir, `${file.id}.json`);
   await writeFile5(path, JSON.stringify(file, null, 2), "utf8");
   return path;
 }
@@ -3512,7 +3529,7 @@ async function listSessions(limit = 30) {
   const summaries = [];
   for (const name of entries) {
     if (!name.endsWith(".json")) continue;
-    const path = join4(dir, name);
+    const path = join5(dir, name);
     try {
       const [s, raw] = await Promise.all([stat2(path), readFile7(path, "utf8")]);
       const parsed = JSON.parse(raw);
@@ -3589,7 +3606,7 @@ __export(app_exports, {
 import { useState as useState6, useRef as useRef3, useEffect as useEffect4, useCallback } from "react";
 import { Box as Box12, Text as Text13, useApp, useInput as useInput2, render } from "ink";
 import { existsSync } from "fs";
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 import { unlink } from "fs/promises";
 import { jsx as jsx13, jsxs as jsxs12 } from "react/jsx-runtime";
 function capEvents(prev) {
@@ -3963,13 +3980,13 @@ function App({ initialCfg, initialUpdateResult }) {
     }
     const cwd = process.cwd();
     for (const name of ["KIMI.md", "KIMIFLARE.md", "AGENT.md"]) {
-      if (existsSync(join5(cwd, name))) {
+      if (existsSync(join6(cwd, name))) {
         setEvents((e) => [
           ...e,
           {
             kind: "info",
             key: mkKey(),
-            text: `${name} already exists at ${join5(cwd, name)} \u2014 delete it first if you want to regenerate`
+            text: `${name} already exists at ${join6(cwd, name)} \u2014 delete it first if you want to regenerate`
           }
         ]);
         return;
@@ -4094,7 +4111,7 @@ function App({ initialCfg, initialUpdateResult }) {
         cfg,
         (text) => setEvents((es) => [...es, { kind: "info", key: mkKey(), text }])
       );
-      if (existsSync(join5(cwd, "KIMI.md"))) {
+      if (existsSync(join6(cwd, "KIMI.md"))) {
         messagesRef.current[0] = {
           role: "system",
           content: buildSystemPrompt({
@@ -4802,11 +4819,11 @@ init_update_check();
 import { Command } from "commander";
 import { readFileSync as readFileSync2 } from "fs";
 import { fileURLToPath as fileURLToPath2 } from "url";
-import { dirname as dirname3, join as join6 } from "path";
+import { dirname as dirname3, join as join7 } from "path";
 function readPackageVersion() {
   try {
     const here = dirname3(fileURLToPath2(import.meta.url));
-    const pkg = JSON.parse(readFileSync2(join6(here, "..", "package.json"), "utf8"));
+    const pkg = JSON.parse(readFileSync2(join7(here, "..", "package.json"), "utf8"));
     return pkg.version ?? "0.0.0";
   } catch {
     return "0.0.0";