kimaki 0.4.43 → 0.4.45

package/src/system-message.ts

@@ -2,12 +2,23 @@
 // Creates the system message injected into every OpenCode session,
 // including Discord-specific formatting rules, diff commands, and permissions info.
 
+export type WorktreeInfo = {
+  /** The worktree directory path */
+  worktreeDirectory: string
+  /** The branch name (e.g., opencode/kimaki-feature) */
+  branch: string
+  /** The main repository directory */
+  mainRepoDirectory: string
+}
+
 export function getOpencodeSystemMessage({
   sessionId,
   channelId,
+  worktree,
 }: {
   sessionId: string
   channelId?: string
+  worktree?: WorktreeInfo
 }) {
   return `
 The user is reading your messages from inside Discord, via kimaki.xyz
@@ -58,6 +69,28 @@ Use this for handoff when:
 - User asks to "handoff", "continue in new thread", or "start fresh session"
 - You detect you're running low on context window space
 - A complex task would benefit from a clean slate with summarized context
+`
+    : ''
+}${
+  worktree
+    ? `
+## worktree
+
+This session is running inside a git worktree.
+- **Worktree path:** \`${worktree.worktreeDirectory}\`
+- **Branch:** \`${worktree.branch}\`
+- **Main repo:** \`${worktree.mainRepoDirectory}\`
+
+Before finishing a task, ask the user if they want to merge changes back to the main branch.
+
+To merge (without leaving the worktree):
+\`\`\`bash
+# Get the default branch name
+DEFAULT_BRANCH=$(git -C ${worktree.mainRepoDirectory} symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@^refs/remotes/origin/@@' || echo "main")
+
+# Merge worktree branch into main
+git -C ${worktree.mainRepoDirectory} checkout $DEFAULT_BRANCH && git -C ${worktree.mainRepoDirectory} merge ${worktree.branch}
+\`\`\`
 `
     : ''
 }
@@ -81,6 +114,10 @@ bunx critique HEAD~1 --web "Update dependencies"
 
 Do this in case you committed the changes yourself (only if the user asks so, never commit otherwise).
 
+To compare two branches:
+
+bunx critique main feature-branch --web "Compare branches"
+
 The command outputs a URL - share that URL with the user so they can see the diff.
 
 ## markdown

package/src/worktree-utils.ts

@@ -0,0 +1,78 @@
+// Worktree utility functions.
+// Wrapper for OpenCode worktree creation that also initializes git submodules.
+
+import { exec } from 'node:child_process'
+import { promisify } from 'node:util'
+import { createLogger } from './logger.js'
+import type { getOpencodeClientV2 } from './opencode.js'
+
+export const execAsync = promisify(exec)
+
+const logger = createLogger('WORKTREE-UTILS')
+
+type OpencodeClientV2 = NonNullable<ReturnType<typeof getOpencodeClientV2>>
+
+type WorktreeResult = {
+  directory: string
+  branch: string
+}
+
+/**
+ * Create a worktree using OpenCode SDK and initialize git submodules.
+ * This wrapper ensures submodules are properly set up in new worktrees.
+ */
+export async function createWorktreeWithSubmodules({
+  clientV2,
+  directory,
+  name,
+}: {
+  clientV2: OpencodeClientV2
+  directory: string
+  name: string
+}): Promise<WorktreeResult | Error> {
+  // 1. Create worktree via OpenCode SDK
+  const response = await clientV2.worktree.create({
+    directory,
+    worktreeCreateInput: { name },
+  })
+
+  if (response.error) {
+    return new Error(`SDK error: ${JSON.stringify(response.error)}`)
+  }
+
+  if (!response.data) {
+    return new Error('No worktree data returned from SDK')
+  }
+
+  const worktreeDir = response.data.directory
+
+  // 2. Init submodules in new worktree (don't block on failure)
+  try {
+    logger.log(`Initializing submodules in ${worktreeDir}`)
+    await execAsync('git submodule update --init --recursive', {
+      cwd: worktreeDir,
+    })
+    logger.log(`Submodules initialized in ${worktreeDir}`)
+  } catch (e) {
+    // Log but don't fail - submodules might not exist
+    logger.warn(
+      `Failed to init submodules in ${worktreeDir}: ${e instanceof Error ? e.message : String(e)}`,
+    )
+  }
+
+  // 3. Install dependencies using ni (detects package manager from lockfile)
+  try {
+    logger.log(`Installing dependencies in ${worktreeDir}`)
+    await execAsync('npx -y ni', {
+      cwd: worktreeDir,
+    })
+    logger.log(`Dependencies installed in ${worktreeDir}`)
+  } catch (e) {
+    // Log but don't fail - might not be a JS project or might fail for various reasons
+    logger.warn(
+      `Failed to install dependencies in ${worktreeDir}: ${e instanceof Error ? e.message : String(e)}`,
+    )
+  }
+
+  return response.data
+}