@kkelly-offical/kkcode 0.1.7 → 0.2.1

package/src/github/workspace.mjs

@@ -1,212 +1,225 @@
-import { execFile } from "node:child_process"
-import { mkdir, readdir, stat, rm } from "node:fs/promises"
-import path from "node:path"
-import { githubReposDir } from "../storage/paths.mjs"
-
-function exec(cmd, args, opts = {}) {
-  return new Promise((resolve, reject) => {
-    execFile(cmd, args, { timeout: 120000, ...opts }, (err, stdout, stderr) => {
-      if (err) {
-        err.stderr = stderr
-        reject(err)
-      } else {
-        resolve(stdout.trim())
-      }
-    })
-  })
-}
-
-export function repoLocalPath(fullName) {
-  const [owner, repo] = fullName.split("/")
-  return path.join(githubReposDir(), owner, repo)
-}
-
-export async function isLocalRepo(fullName) {
-  try {
-    const p = repoLocalPath(fullName)
-    const s = await stat(path.join(p, ".git"))
-    return s.isDirectory()
-  } catch {
-    return false
-  }
-}
-
-export async function ensureRepo({ fullName, branch, token }) {
-  const localPath = repoLocalPath(fullName)
-  const exists = await isLocalRepo(fullName)
-
-  if (!exists) {
-    // Clone
-    await mkdir(path.dirname(localPath), { recursive: true })
-    const cloneUrl = `https://${token}@github.com/${fullName}.git`
-    await exec("git", ["clone", "--depth", "1", "-b", branch, "--single-branch", cloneUrl, localPath])
-    // Remove token from remote URL
-    const cleanUrl = `https://github.com/${fullName}.git`
-    await exec("git", ["remote", "set-url", "origin", cleanUrl], { cwd: localPath })
-    // Store token in git credential for this repo
-    await configureCredential(localPath, token)
-    return { path: localPath, isNew: true }
-  }
-
-  // Existing repo — fetch & checkout
-  await configureCredential(localPath, token)
-  await exec("git", ["fetch", "origin"], { cwd: localPath })
-
-  // Check if branch exists locally
-  const localBranchList = await localBranches(localPath)
-  if (localBranchList.includes(branch)) {
-    await exec("git", ["checkout", branch], { cwd: localPath })
-    await exec("git", ["pull", "--ff-only", "origin", branch], { cwd: localPath }).catch(() => {
-      // pull may fail if diverged, that's ok
-    })
-  } else {
-    // Checkout remote branch
-    await exec("git", ["checkout", "-b", branch, `origin/${branch}`], { cwd: localPath })
-  }
-
-  return { path: localPath, isNew: false }
-}
-
-async function configureCredential(repoPath, token) {
-  // Use store credential helper scoped to this repo
-  const credentialPath = path.join(repoPath, ".git", "kkcode-credentials")
-  const { writeFile } = await import("node:fs/promises")
-  await writeFile(credentialPath, `https://x-access-token:${token}@github.com\n`, "utf8")
-  await exec("git", ["config", "credential.helper", `store --file="${credentialPath}"`], { cwd: repoPath })
-}
-
-export async function listLocalRepos() {
-  const root = githubReposDir()
-  const repos = []
-  try {
-    const owners = await readdir(root)
-    for (const owner of owners) {
-      const ownerPath = path.join(root, owner)
-      const ownerStat = await stat(ownerPath).catch(() => null)
-      if (!ownerStat || !ownerStat.isDirectory()) continue
-      const names = await readdir(ownerPath)
-      for (const name of names) {
-        const gitDir = path.join(ownerPath, name, ".git")
-        const gitStat = await stat(gitDir).catch(() => null)
-        if (gitStat && gitStat.isDirectory()) {
-          repos.push(`${owner}/${name}`)
-        }
-      }
-    }
-  } catch {
-    // repos dir doesn't exist yet
-  }
-  return repos
-}
-
-export async function localBranches(repoPath) {
-  try {
-    const out = await exec("git", ["branch", "--list", "--format=%(refname:short)"], { cwd: repoPath })
-    return out.split("\n").filter(Boolean)
-  } catch {
-    return []
-  }
-}
-
-export async function removeLocalRepo(fullName) {
-  const localPath = repoLocalPath(fullName)
-  try {
-    await rm(localPath, { recursive: true, force: true })
-    return true
-  } catch {
-    return false
-  }
-}
-
-export async function syncRepo({ fullName, branch, token }) {
-  const localPath = repoLocalPath(fullName)
-  await configureCredential(localPath, token)
-  await exec("git", ["fetch", "origin"], { cwd: localPath })
-
-  // Check if branch exists locally
-  const localBranchList = await localBranches(localPath)
-  if (localBranchList.includes(branch)) {
-    await exec("git", ["checkout", branch], { cwd: localPath })
-    await exec("git", ["pull", "--ff-only", "origin", branch], { cwd: localPath }).catch(() => {
-      // pull may fail if diverged, that's ok
-    })
-  } else {
-    // Checkout remote branch
-    await exec("git", ["checkout", "-b", branch, `origin/${branch}`], { cwd: localPath })
-  }
-
-  return { path: localPath }
-}
-
-// Check if there are uncommitted changes
-export async function hasLocalChanges(repoPath) {
-  try {
-    const status = await exec("git", ["status", "--porcelain"], { cwd: repoPath })
-    return status.length > 0
-  } catch {
-    return false
-  }
-}
-
-// Get diff stats for display
-export async function getDiffStats(repoPath) {
-  try {
-    const stats = await exec("git", ["diff", "--stat", "HEAD"], { cwd: repoPath })
-    return stats
-  } catch {
-    return ""
-  }
-}
-
-// Get changed files list
-export async function getChangedFiles(repoPath) {
-  try {
-    const output = await exec("git", ["status", "--short"], { cwd: repoPath })
-    return output.split("\n").filter(Boolean)
-  } catch {
-    return []
-  }
-}
-
-// Commit and push changes
-export async function commitAndPush({ repoPath, message, branch, token }) {
-  await configureCredential(repoPath, token)
-
-  // Add all changes
-  await exec("git", ["add", "-A"], { cwd: repoPath })
-
-  // Commit
-  await exec("git", ["commit", "-m", message], { cwd: repoPath })
-
-  // Push
-  await exec("git", ["push", "origin", branch], { cwd: repoPath })
-
-  return true
-}
-
-// Generate a commit message based on changes
-export async function generateCommitMessage(repoPath) {
-  try {
-    const files = await getChangedFiles(repoPath)
-    if (files.length === 0) return "Update files"
-
-    // Count types of changes
-    const added = files.filter(f => f.startsWith("A") || f.startsWith("??")).length
-    const modified = files.filter(f => f.startsWith("M")).length
-    const deleted = files.filter(f => f.startsWith("D")).length
-
-    if (added > 0 && modified === 0 && deleted === 0) {
-      return added === 1 ? "Add file" : `Add ${added} files`
-    }
-    if (modified > 0 && added === 0 && deleted === 0) {
-      return modified === 1 ? "Update file" : `Update ${modified} files`
-    }
-    if (deleted > 0 && added === 0 && modified === 0) {
-      return deleted === 1 ? "Remove file" : `Remove ${deleted} files`
-    }
-
-    return `Update files (+${added} ~${modified} -${deleted})`
-  } catch {
-    return "Update files"
-  }
-}
+import { execFile } from "node:child_process"
+import { chmod, mkdir, readdir, stat, rm } from "node:fs/promises"
+import path from "node:path"
+import { githubReposDir } from "../storage/paths.mjs"
+
+function exec(cmd, args, opts = {}) {
+  return new Promise((resolve, reject) => {
+    execFile(cmd, args, { timeout: 120000, ...opts }, (err, stdout, stderr) => {
+      if (err) {
+        err.stderr = stderr
+        reject(err)
+      } else {
+        resolve(stdout.trim())
+      }
+    })
+  })
+}
+
+export function repoLocalPath(fullName) {
+  const [owner, repo] = fullName.split("/")
+  return path.join(githubReposDir(), owner, repo)
+}
+
+export async function isLocalRepo(fullName) {
+  try {
+    const p = repoLocalPath(fullName)
+    const s = await stat(path.join(p, ".git"))
+    return s.isDirectory()
+  } catch {
+    return false
+  }
+}
+
+export async function ensureRepo({ fullName, branch, token }) {
+  const localPath = repoLocalPath(fullName)
+  const exists = await isLocalRepo(fullName)
+
+  if (!exists) {
+    // Clone
+    await mkdir(path.dirname(localPath), { recursive: true })
+    const cloneUrl = `https://${token}@github.com/${fullName}.git`
+    try {
+      await exec("git", ["clone", "--depth", "1", "-b", branch, "--single-branch", cloneUrl, localPath])
+    } catch (err) {
+      sanitizeTokenFromError(err, token)
+      throw err
+    }
+    // Remove token from remote URL
+    const cleanUrl = `https://github.com/${fullName}.git`
+    await exec("git", ["remote", "set-url", "origin", cleanUrl], { cwd: localPath })
+    // Store token in git credential for this repo
+    await configureCredential(localPath, token)
+    return { path: localPath, isNew: true }
+  }
+
+  // Existing repo — fetch & checkout
+  await configureCredential(localPath, token)
+  await exec("git", ["fetch", "origin"], { cwd: localPath })
+
+  // Check if branch exists locally
+  const localBranchList = await localBranches(localPath)
+  if (localBranchList.includes(branch)) {
+    await exec("git", ["checkout", branch], { cwd: localPath })
+    await exec("git", ["pull", "--ff-only", "origin", branch], { cwd: localPath }).catch(() => {
+      // pull may fail if diverged, that's ok
+    })
+  } else {
+    // Checkout remote branch
+    await exec("git", ["checkout", "-b", branch, `origin/${branch}`], { cwd: localPath })
+  }
+
+  return { path: localPath, isNew: false }
+}
+
+function sanitizeTokenFromError(err, token) {
+  const mask = (s) => s ? s.replace(/https:\/\/[^@\s]+@/g, "https://***@") : s
+  if (err.message) err.message = mask(err.message)
+  if (err.stderr) err.stderr = mask(err.stderr)
+  if (err.stdout) err.stdout = mask(err.stdout)
+}
+
+async function configureCredential(repoPath, token) {
+  // Use store credential helper scoped to this repo
+  const credentialPath = path.join(repoPath, ".git", "kkcode-credentials")
+  const { writeFile } = await import("node:fs/promises")
+  await writeFile(credentialPath, `https://x-access-token:${token}@github.com\n`, { encoding: "utf8", mode: 0o600 })
+  await chmod(credentialPath, 0o600)
+  await exec("git", ["config", "credential.helper", `store --file="${credentialPath}"`], { cwd: repoPath })
+}
+
+export async function listLocalRepos() {
+  const root = githubReposDir()
+  const repos = []
+  try {
+    const owners = await readdir(root)
+    for (const owner of owners) {
+      const ownerPath = path.join(root, owner)
+      const ownerStat = await stat(ownerPath).catch(() => null)
+      if (!ownerStat || !ownerStat.isDirectory()) continue
+      const names = await readdir(ownerPath)
+      for (const name of names) {
+        const gitDir = path.join(ownerPath, name, ".git")
+        const gitStat = await stat(gitDir).catch(() => null)
+        if (gitStat && gitStat.isDirectory()) {
+          repos.push(`${owner}/${name}`)
+        }
+      }
+    }
+  } catch {
+    // repos dir doesn't exist yet
+  }
+  return repos
+}
+
+export async function localBranches(repoPath) {
+  try {
+    const out = await exec("git", ["branch", "--list", "--format=%(refname:short)"], { cwd: repoPath })
+    return out.split("\n").filter(Boolean)
+  } catch {
+    return []
+  }
+}
+
+export async function removeLocalRepo(fullName) {
+  const localPath = repoLocalPath(fullName)
+  try {
+    await rm(localPath, { recursive: true, force: true })
+    return true
+  } catch {
+    return false
+  }
+}
+
+export async function syncRepo({ fullName, branch, token }) {
+  const localPath = repoLocalPath(fullName)
+  await configureCredential(localPath, token)
+  await exec("git", ["fetch", "origin"], { cwd: localPath })
+
+  // Check if branch exists locally
+  const localBranchList = await localBranches(localPath)
+  if (localBranchList.includes(branch)) {
+    await exec("git", ["checkout", branch], { cwd: localPath })
+    await exec("git", ["pull", "--ff-only", "origin", branch], { cwd: localPath }).catch(() => {
+      // pull may fail if diverged, that's ok
+    })
+  } else {
+    // Checkout remote branch
+    await exec("git", ["checkout", "-b", branch, `origin/${branch}`], { cwd: localPath })
+  }
+
+  return { path: localPath }
+}
+
+// Check if there are uncommitted changes
+export async function hasLocalChanges(repoPath) {
+  try {
+    const status = await exec("git", ["status", "--porcelain"], { cwd: repoPath })
+    return status.length > 0
+  } catch {
+    return false
+  }
+}
+
+// Get diff stats for display
+export async function getDiffStats(repoPath) {
+  try {
+    const stats = await exec("git", ["diff", "--stat", "HEAD"], { cwd: repoPath })
+    return stats
+  } catch {
+    return ""
+  }
+}
+
+// Get changed files list
+export async function getChangedFiles(repoPath) {
+  try {
+    const output = await exec("git", ["status", "--short"], { cwd: repoPath })
+    return output.split("\n").filter(Boolean)
+  } catch {
+    return []
+  }
+}
+
+// Commit and push changes
+export async function commitAndPush({ repoPath, message, branch, token }) {
+  await configureCredential(repoPath, token)
+
+  // Add all changes
+  await exec("git", ["add", "-A"], { cwd: repoPath })
+
+  // Commit
+  await exec("git", ["commit", "-m", message], { cwd: repoPath })
+
+  // Push
+  await exec("git", ["push", "origin", branch], { cwd: repoPath })
+
+  return true
+}
+
+// Generate a commit message based on changes
+export async function generateCommitMessage(repoPath) {
+  try {
+    const files = await getChangedFiles(repoPath)
+    if (files.length === 0) return "Update files"
+
+    // Count types of changes
+    const added = files.filter(f => f.startsWith("A") || f.startsWith("??")).length
+    const modified = files.filter(f => f.startsWith("M")).length
+    const deleted = files.filter(f => f.startsWith("D")).length
+
+    if (added > 0 && modified === 0 && deleted === 0) {
+      return added === 1 ? "Add file" : `Add ${added} files`
+    }
+    if (modified > 0 && added === 0 && deleted === 0) {
+      return modified === 1 ? "Update file" : `Update ${modified} files`
+    }
+    if (deleted > 0 && added === 0 && modified === 0) {
+      return deleted === 1 ? "Remove file" : `Remove ${deleted} files`
+    }
+
+    return `Update files (+${added} ~${modified} -${deleted})`
+  } catch {
+    return "Update files"
+  }
+}

package/src/index.mjs

@@ -1,82 +1,84 @@
-#!/usr/bin/env node
-import { Command } from "commander"
-import { createThemeCommand } from "./commands/theme.mjs"
-import { createUsageCommand } from "./commands/usage.mjs"
-import { createReviewCommand } from "./commands/review.mjs"
-import { createSessionCommand } from "./commands/session.mjs"
-import { createChatCommand } from "./commands/chat.mjs"
-import { createAgentCommand } from "./commands/agent.mjs"
-import { createMcpCommand } from "./commands/mcp.mjs"
-import { createPermissionCommand } from "./commands/permission.mjs"
-import { createDoctorCommand } from "./commands/doctor.mjs"
-import { createConfigCommand } from "./commands/config.mjs"
-import { createPromptCommand } from "./commands/prompt.mjs"
-import { createLongagentCommand } from "./commands/longagent.mjs"
-import { createHookCommand } from "./commands/hook.mjs"
-import { createCommandCommand } from "./commands/command.mjs"
-import { createRuleCommand } from "./commands/rule.mjs"
-import { createBackgroundCommand } from "./commands/background.mjs"
-import { createInitCommand } from "./commands/init.mjs"
-import { createAuditCommand } from "./commands/audit.mjs"
-import { startRepl } from "./repl.mjs"
-
-async function main() {
-  const hasTrust = process.argv.includes("--trust")
-  const hasGithub = process.argv.includes("--github")
-
-  if (hasGithub) {
-    const githubArgIndex = process.argv.indexOf("--github")
-    const nextArg = process.argv[githubArgIndex + 1]
-    
-    if (nextArg === "logout") {
-      const { logout } = await import("./github/auth.mjs")
-      const success = await logout()
-      if (success) {
-        console.log("✓ 已登出 GitHub 账户")
-      } else {
-        console.log("⚠ 没有已登录的 GitHub 账户")
-      }
-      return
-    }
-    
-    const { runGitHubFlow, promptPushChanges } = await import("./github/flow.mjs")
-    const result = await runGitHubFlow()
-    process.chdir(result.cwd)
-    await startRepl({ trust: hasTrust })
-    // After REPL exits, ask user if they want to push changes
-    await promptPushChanges(result)
-    return
-  }
-
-  if (process.argv.length <= 2 || (process.argv.length === 3 && hasTrust)) {
-    await startRepl({ trust: hasTrust })
-    return
-  }
-
-  const program = new Command()
-  program.name("kkcode").description("kkcode CLI").version("0.1.6")
-  program.addCommand(createChatCommand())
-  program.addCommand(createThemeCommand())
-  program.addCommand(createUsageCommand())
-  program.addCommand(createReviewCommand())
-  program.addCommand(createAgentCommand())
-  program.addCommand(createMcpCommand())
-  program.addCommand(createPermissionCommand())
-  program.addCommand(createDoctorCommand())
-  program.addCommand(createConfigCommand())
-  program.addCommand(createSessionCommand())
-  program.addCommand(createPromptCommand())
-  program.addCommand(createLongagentCommand())
-  program.addCommand(createHookCommand())
-  program.addCommand(createCommandCommand())
-  program.addCommand(createRuleCommand())
-  program.addCommand(createBackgroundCommand())
-  program.addCommand(createAuditCommand())
-  program.addCommand(createInitCommand())
-  await program.parseAsync(process.argv)
-}
-
-main().catch((error) => {
-  console.error(error.message)
-  process.exit(1)
-})
+#!/usr/bin/env node
+import { Command } from "commander"
+import { createThemeCommand } from "./commands/theme.mjs"
+import { createUsageCommand } from "./commands/usage.mjs"
+import { createReviewCommand } from "./commands/review.mjs"
+import { createSessionCommand } from "./commands/session.mjs"
+import { createChatCommand } from "./commands/chat.mjs"
+import { createAgentCommand } from "./commands/agent.mjs"
+import { createMcpCommand } from "./commands/mcp.mjs"
+import { createPermissionCommand } from "./commands/permission.mjs"
+import { createDoctorCommand } from "./commands/doctor.mjs"
+import { createConfigCommand } from "./commands/config.mjs"
+import { createPromptCommand } from "./commands/prompt.mjs"
+import { createLongagentCommand } from "./commands/longagent.mjs"
+import { createHookCommand } from "./commands/hook.mjs"
+import { createCommandCommand } from "./commands/command.mjs"
+import { createRuleCommand } from "./commands/rule.mjs"
+import { createBackgroundCommand } from "./commands/background.mjs"
+import { createInitCommand } from "./commands/init.mjs"
+import { createAuditCommand } from "./commands/audit.mjs"
+import { createSkillCommand } from "./commands/skill.mjs"
+import { startRepl } from "./repl.mjs"
+
+async function main() {
+  const hasTrust = process.argv.includes("--trust")
+  const hasGithub = process.argv.includes("--github")
+
+  if (hasGithub) {
+    const githubArgIndex = process.argv.indexOf("--github")
+    const nextArg = process.argv[githubArgIndex + 1]
+    
+    if (nextArg === "logout") {
+      const { logout } = await import("./github/auth.mjs")
+      const success = await logout()
+      if (success) {
+        console.log("✓ 已登出 GitHub 账户")
+      } else {
+        console.log("⚠ 没有已登录的 GitHub 账户")
+      }
+      return
+    }
+    
+    const { runGitHubFlow, promptPushChanges } = await import("./github/flow.mjs")
+    const result = await runGitHubFlow()
+    process.chdir(result.cwd)
+    await startRepl({ trust: hasTrust })
+    // After REPL exits, ask user if they want to push changes
+    await promptPushChanges(result)
+    return
+  }
+
+  if (process.argv.length <= 2 || (process.argv.length === 3 && hasTrust)) {
+    await startRepl({ trust: hasTrust })
+    return
+  }
+
+  const program = new Command()
+  program.name("kkcode").description("kkcode CLI").version("0.2.1")
+  program.addCommand(createChatCommand())
+  program.addCommand(createThemeCommand())
+  program.addCommand(createUsageCommand())
+  program.addCommand(createReviewCommand())
+  program.addCommand(createAgentCommand())
+  program.addCommand(createMcpCommand())
+  program.addCommand(createPermissionCommand())
+  program.addCommand(createDoctorCommand())
+  program.addCommand(createConfigCommand())
+  program.addCommand(createSessionCommand())
+  program.addCommand(createPromptCommand())
+  program.addCommand(createLongagentCommand())
+  program.addCommand(createHookCommand())
+  program.addCommand(createCommandCommand())
+  program.addCommand(createRuleCommand())
+  program.addCommand(createBackgroundCommand())
+  program.addCommand(createAuditCommand())
+  program.addCommand(createInitCommand())
+  program.addCommand(createSkillCommand())
+  await program.parseAsync(process.argv)
+}
+
+main().catch((error) => {
+  console.error(error.message)
+  process.exit(1)
+})