kimaki 0.4.33 → 0.4.34

package/dist/cli.js

@@ -213,7 +213,9 @@ async function registerCommands(token, appId, userCommands = []) {
         if (SKIP_USER_COMMANDS.includes(cmd.name)) {
             continue;
         }
-        const commandName = `${cmd.name}-cmd`;
+        // Sanitize command name: oh-my-opencode uses MCP commands with colons, which Discord doesn't allow
+        const sanitizedName = cmd.name.replace(/:/g, '-');
+        const commandName = `${sanitizedName}-cmd`;
         const description = cmd.description || `Run /${cmd.name} command`;
         commands.push(new SlashCommandBuilder()
             .setName(commandName)

package/dist/logger.js

@@ -5,6 +5,7 @@ import { log } from '@clack/prompts';
 import fs from 'node:fs';
 import path, { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import util from 'node:util';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const isDev = !__dirname.includes('node_modules');
@@ -17,35 +18,41 @@ if (isDev) {
     }
     fs.writeFileSync(logFilePath, `--- kimaki log started at ${new Date().toISOString()} ---\n`);
 }
+function formatArg(arg) {
+    if (typeof arg === 'string') {
+        return arg;
+    }
+    return util.inspect(arg, { colors: true, depth: 4 });
+}
 function writeToFile(level, prefix, args) {
     if (!isDev) {
         return;
     }
     const timestamp = new Date().toISOString();
-    const message = `[${timestamp}] [${level}] [${prefix}] ${args.map((arg) => String(arg)).join(' ')}\n`;
+    const message = `[${timestamp}] [${level}] [${prefix}] ${args.map(formatArg).join(' ')}\n`;
     fs.appendFileSync(logFilePath, message);
 }
 export function createLogger(prefix) {
     return {
         log: (...args) => {
             writeToFile('INFO', prefix, args);
-            log.info([`[${prefix}]`, ...args.map((arg) => String(arg))].join(' '));
+            log.info([`[${prefix}]`, ...args.map(formatArg)].join(' '));
         },
         error: (...args) => {
             writeToFile('ERROR', prefix, args);
-            log.error([`[${prefix}]`, ...args.map((arg) => String(arg))].join(' '));
+            log.error([`[${prefix}]`, ...args.map(formatArg)].join(' '));
         },
         warn: (...args) => {
             writeToFile('WARN', prefix, args);
-            log.warn([`[${prefix}]`, ...args.map((arg) => String(arg))].join(' '));
+            log.warn([`[${prefix}]`, ...args.map(formatArg)].join(' '));
         },
         info: (...args) => {
             writeToFile('INFO', prefix, args);
-            log.info([`[${prefix}]`, ...args.map((arg) => String(arg))].join(' '));
+            log.info([`[${prefix}]`, ...args.map(formatArg)].join(' '));
         },
         debug: (...args) => {
             writeToFile('DEBUG', prefix, args);
-            log.info([`[${prefix}]`, ...args.map((arg) => String(arg))].join(' '));
+            log.info([`[${prefix}]`, ...args.map(formatArg)].join(' '));
         },
     };
 }

package/dist/session-handler.js

@@ -9,7 +9,7 @@ import { formatPart } from './message-formatting.js';
 import { getOpencodeSystemMessage } from './system-message.js';
 import { createLogger } from './logger.js';
 import { isAbortError } from './utils.js';
-import { showAskUserQuestionDropdowns, cancelPendingQuestion } from './commands/ask-question.js';
+import { showAskUserQuestionDropdowns, cancelPendingQuestion, pendingQuestionContexts } from './commands/ask-question.js';
 import { showPermissionDropdown, cleanupPermissionContext } from './commands/permissions.js';
 const sessionLogger = createLogger('SESSION');
 const voiceLogger = createLogger('VOICE');
@@ -154,11 +154,10 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
             pendingPermissions.delete(thread.id);
         }
     }
-    // Cancel any pending question tool if user sends a new message
+    // Cancel any pending question tool if user sends a new message (silently, no thread message)
     const questionCancelled = await cancelPendingQuestion(thread.id);
     if (questionCancelled) {
         sessionLogger.log(`[QUESTION] Cancelled pending question due to new message`);
-        await sendThreadMessage(thread, `⚠️ Previous question cancelled - processing your new message`);
     }
     const abortController = new AbortController();
     abortControllers.set(session.id, abortController);
@@ -310,7 +309,12 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
                         currentParts.push(part);
                     }
                     if (part.type === 'step-start') {
-                        stopTyping = startTyping();
+                        // Don't start typing if user needs to respond to a question or permission
+                        const hasPendingQuestion = [...pendingQuestionContexts.values()].some((ctx) => ctx.thread.id === thread.id);
+                        const hasPendingPermission = pendingPermissions.has(thread.id);
+                        if (!hasPendingQuestion && !hasPendingPermission) {
+                            stopTyping = startTyping();
+                        }
                     }
                     if (part.type === 'tool' && part.state.status === 'running') {
                         // Flush any pending text/reasoning parts before showing the tool
@@ -348,6 +352,11 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
                     if (part.type === 'reasoning') {
                         await sendPartMessage(part);
                     }
+                    // Send text parts when complete (time.end is set)
+                    // Text parts stream incrementally; only send when finished to avoid partial text
+                    if (part.type === 'text' && part.time?.end) {
+                        await sendPartMessage(part);
+                    }
                     if (part.type === 'step-finish') {
                         for (const p of currentParts) {
                             if (p.type !== 'step-start' && p.type !== 'step-finish') {
@@ -357,6 +366,11 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
                         setTimeout(() => {
                             if (abortController.signal.aborted)
                                 return;
+                            // Don't restart typing if user needs to respond to a question or permission
+                            const hasPendingQuestion = [...pendingQuestionContexts.values()].some((ctx) => ctx.thread.id === thread.id);
+                            const hasPendingPermission = pendingPermissions.has(thread.id);
+                            if (hasPendingQuestion || hasPendingPermission)
+                                return;
                             stopTyping = startTyping();
                         }, 300);
                     }
@@ -391,6 +405,11 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
                         continue;
                     }
                     sessionLogger.log(`Permission requested: permission=${permission.permission}, patterns=${permission.patterns.join(', ')}`);
+                    // Stop typing - user needs to respond now, not the bot
+                    if (stopTyping) {
+                        stopTyping();
+                        stopTyping = null;
+                    }
                     // Show dropdown instead of text message
                     const { messageId, contextHash } = await showPermissionDropdown({
                         thread,
@@ -423,6 +442,11 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
                         continue;
                     }
                     sessionLogger.log(`Question requested: id=${questionRequest.id}, questions=${questionRequest.questions.length}`);
+                    // Stop typing - user needs to respond now, not the bot
+                    if (stopTyping) {
+                        stopTyping();
+                        stopTyping = null;
+                    }
                     // Flush any pending text/reasoning parts before showing the dropdown
                     // This ensures text the LLM generated before the question tool is shown first
                     for (const p of currentParts) {
@@ -438,6 +462,13 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
                         input: { questions: questionRequest.questions },
                     });
                 }
+                else if (event.type === 'session.idle') {
+                    // Session is done processing - abort to signal completion
+                    if (event.properties.sessionID === session.id) {
+                        sessionLogger.log(`[SESSION IDLE] Session ${session.id} is idle, aborting`);
+                        abortController.abort('finished');
+                    }
+                }
             }
         }
         catch (e) {

package/dist/system-message.js

@@ -65,5 +65,18 @@ headings are discouraged anyway. instead try to use bold text for titles which r
 ## diagrams
 
 you can create diagrams wrapping them in code blocks.
+
+## ending conversations with options
+
+IMPORTANT: At the end of each response, especially after completing a task or presenting a plan, use the question tool to offer the user clear options for what to do next.
+
+Examples:
+- After showing a plan: offer "Start implementing?" with Yes/No options
+- After completing edits: offer "Commit changes?" with Yes/No options
+- After debugging: offer "How to proceed?" with options like "Apply fix", "Investigate further", "Try different approach"
+
+The user can always select "Other" to type a custom response if the provided options don't fit their needs, or if the plan needs updating.
+
+This makes the interaction more guided and reduces friction for the user.
 `;
 }

package/dist/unnest-code-blocks.js

@@ -31,10 +31,14 @@ function processListToken(list) {
 function processListItem(item, prefix) {
     const segments = [];
     let currentText = [];
+    // Track if we've seen a code block - text after code uses continuation prefix
+    let seenCodeBlock = false;
     const flushText = () => {
         const text = currentText.join('').trim();
         if (text) {
-            segments.push({ type: 'list-item', prefix, content: text });
+            // After a code block, use '-' as continuation prefix to avoid repeating numbers
+            const effectivePrefix = seenCodeBlock ? '- ' : prefix;
+            segments.push({ type: 'list-item', prefix: effectivePrefix, content: text });
         }
         currentText = [];
     };
@@ -47,6 +51,7 @@ function processListItem(item, prefix) {
                 type: 'code',
                 content: '```' + lang + '\n' + codeToken.text + '\n```\n',
             });
+            seenCodeBlock = true;
         }
         else if (token.type === 'list') {
             flushText();

package/dist/unnest-code-blocks.test.js

@@ -211,3 +211,197 @@ test('handles empty list item with code', () => {
     "
   `);
 });
+test('numbered list with text after code block', () => {
+    const input = `1. First item
+   \`\`\`js
+   const a = 1
+   \`\`\`
+   Text after the code
+2. Second item`;
+    const result = unnestCodeBlocksFromLists(input);
+    expect(result).toMatchInlineSnapshot(`
+    "1. First item
+
+    \`\`\`js
+    const a = 1
+    \`\`\`
+    - Text after the code
+    2. Second item"
+  `);
+});
+test('numbered list with multiple code blocks and text between', () => {
+    const input = `1. First item
+   \`\`\`js
+   const a = 1
+   \`\`\`
+   Middle text
+   \`\`\`python
+   b = 2
+   \`\`\`
+   Final text
+2. Second item`;
+    const result = unnestCodeBlocksFromLists(input);
+    expect(result).toMatchInlineSnapshot(`
+    "1. First item
+
+    \`\`\`js
+    const a = 1
+    \`\`\`
+    - Middle text
+
+    \`\`\`python
+    b = 2
+    \`\`\`
+    - Final text
+    2. Second item"
+  `);
+});
+test('unordered list with multiple code blocks and text between', () => {
+    const input = `- First item
+  \`\`\`js
+  const a = 1
+  \`\`\`
+  Middle text
+  \`\`\`python
+  b = 2
+  \`\`\`
+  Final text
+- Second item`;
+    const result = unnestCodeBlocksFromLists(input);
+    expect(result).toMatchInlineSnapshot(`
+    "- First item
+
+    \`\`\`js
+    const a = 1
+    \`\`\`
+    - Middle text
+
+    \`\`\`python
+    b = 2
+    \`\`\`
+    - Final text
+    - Second item"
+  `);
+});
+test('numbered list starting from 5', () => {
+    const input = `5. Fifth item
+   \`\`\`js
+   code
+   \`\`\`
+   Text after
+6. Sixth item`;
+    const result = unnestCodeBlocksFromLists(input);
+    expect(result).toMatchInlineSnapshot(`
+    "5. Fifth item
+
+    \`\`\`js
+    code
+    \`\`\`
+    - Text after
+    6. Sixth item"
+  `);
+});
+test('deeply nested list with code', () => {
+    const input = `- Level 1
+  - Level 2
+    - Level 3
+      \`\`\`js
+      deep code
+      \`\`\`
+      Text after deep code
+    - Another level 3
+  - Back to level 2`;
+    const result = unnestCodeBlocksFromLists(input);
+    expect(result).toMatchInlineSnapshot(`
+    "- Level 1
+    - Level 2
+    - Level 3
+
+    \`\`\`js
+    deep code
+    \`\`\`
+    - Text after deep code
+    - Another level 3- Back to level 2"
+  `);
+});
+test('nested numbered list inside unordered with code', () => {
+    const input = `- Unordered item
+  1. Nested numbered
+     \`\`\`js
+     code
+     \`\`\`
+     Text after
+  2. Second nested
+- Another unordered`;
+    const result = unnestCodeBlocksFromLists(input);
+    expect(result).toMatchInlineSnapshot(`
+    "- Unordered item
+    1. Nested numbered
+
+    \`\`\`js
+    code
+    \`\`\`
+    - Text after
+    2. Second nested- Another unordered"
+  `);
+});
+test('code block at end of numbered item no text after', () => {
+    const input = `1. First with text
+   \`\`\`js
+   code here
+   \`\`\`
+2. Second item
+3. Third item`;
+    const result = unnestCodeBlocksFromLists(input);
+    expect(result).toMatchInlineSnapshot(`
+    "1. First with text
+
+    \`\`\`js
+    code here
+    \`\`\`
+    2. Second item
+    3. Third item"
+  `);
+});
+test('multiple items each with code and text after', () => {
+    const input = `1. First
+   \`\`\`js
+   code1
+   \`\`\`
+   After first
+2. Second
+   \`\`\`python
+   code2
+   \`\`\`
+   After second
+3. Third no code`;
+    const result = unnestCodeBlocksFromLists(input);
+    expect(result).toMatchInlineSnapshot(`
+    "1. First
+
+    \`\`\`js
+    code1
+    \`\`\`
+    - After first
+    2. Second
+
+    \`\`\`python
+    code2
+    \`\`\`
+    - After second
+    3. Third no code"
+  `);
+});
+test('code block immediately after list marker', () => {
+    const input = `1. \`\`\`js
+   immediate code
+   \`\`\`
+2. Normal item`;
+    const result = unnestCodeBlocksFromLists(input);
+    expect(result).toMatchInlineSnapshot(`
+    "\`\`\`js
+    immediate code
+    \`\`\`
+    2. Normal item"
+  `);
+});

package/package.json

@@ -2,7 +2,7 @@
   "name": "kimaki",
   "module": "index.ts",
   "type": "module",
-  "version": "0.4.33",
+  "version": "0.4.34",
   "scripts": {
     "dev": "tsx --env-file .env src/cli.ts",
     "prepublishOnly": "pnpm tsc",
@@ -30,30 +30,29 @@
     "tsx": "^4.20.5"
   },
   "dependencies": {
-    "@ai-sdk/google": "^2.0.47",
     "@clack/prompts": "^0.11.0",
-    "@discordjs/opus": "^0.10.0",
     "@discordjs/voice": "^0.19.0",
     "@google/genai": "^1.34.0",
     "@opencode-ai/sdk": "^1.1.12",
     "@purinton/resampler": "^1.0.4",
-    "@snazzah/davey": "^0.1.6",
     "ai": "^5.0.114",
     "better-sqlite3": "^12.3.0",
     "cac": "^6.7.14",
     "discord.js": "^14.16.3",
     "domhandler": "^5.0.3",
     "glob": "^13.0.0",
-    "go-try": "^3.0.2",
     "htmlparser2": "^10.0.0",
     "js-yaml": "^4.1.0",
     "marked": "^16.3.0",
     "picocolors": "^1.1.1",
     "pretty-ms": "^9.3.0",
-    "prism-media": "^1.3.5",
     "ripgrep-js": "^3.0.0",
     "string-dedent": "^3.0.2",
     "undici": "^7.16.0",
     "zod": "^4.2.1"
+  },
+  "optionalDependencies": {
+    "@discordjs/opus": "^0.10.0",
+    "prism-media": "^1.3.5"
   }
 }

package/src/cli.ts

@@ -279,7 +279,9 @@ async function registerCommands(token: string, appId: string, userCommands: Open
       continue
     }
 
-    const commandName = `${cmd.name}-cmd`
+    // Sanitize command name: oh-my-opencode uses MCP commands with colons, which Discord doesn't allow
+    const sanitizedName = cmd.name.replace(/:/g, '-')
+    const commandName = `${sanitizedName}-cmd`
     const description = cmd.description || `Run /${cmd.name} command`
 
     commands.push(

package/src/logger.ts

@@ -6,6 +6,7 @@ import { log } from '@clack/prompts'
 import fs from 'node:fs'
 import path, { dirname } from 'node:path'
 import { fileURLToPath } from 'node:url'
+import util from 'node:util'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = dirname(__filename)
@@ -22,36 +23,43 @@ if (isDev) {
   fs.writeFileSync(logFilePath, `--- kimaki log started at ${new Date().toISOString()} ---\n`)
 }
 
-function writeToFile(level: string, prefix: string, args: any[]) {
+function formatArg(arg: unknown): string {
+  if (typeof arg === 'string') {
+    return arg
+  }
+  return util.inspect(arg, { colors: true, depth: 4 })
+}
+
+function writeToFile(level: string, prefix: string, args: unknown[]) {
   if (!isDev) {
     return
   }
   const timestamp = new Date().toISOString()
-  const message = `[${timestamp}] [${level}] [${prefix}] ${args.map((arg) => String(arg)).join(' ')}\n`
+  const message = `[${timestamp}] [${level}] [${prefix}] ${args.map(formatArg).join(' ')}\n`
   fs.appendFileSync(logFilePath, message)
 }
 
 export function createLogger(prefix: string) {
   return {
-    log: (...args: any[]) => {
+    log: (...args: unknown[]) => {
       writeToFile('INFO', prefix, args)
-      log.info([`[${prefix}]`, ...args.map((arg) => String(arg))].join(' '))
+      log.info([`[${prefix}]`, ...args.map(formatArg)].join(' '))
     },
-    error: (...args: any[]) => {
+    error: (...args: unknown[]) => {
       writeToFile('ERROR', prefix, args)
-      log.error([`[${prefix}]`, ...args.map((arg) => String(arg))].join(' '))
+      log.error([`[${prefix}]`, ...args.map(formatArg)].join(' '))
     },
-    warn: (...args: any[]) => {
+    warn: (...args: unknown[]) => {
       writeToFile('WARN', prefix, args)
-      log.warn([`[${prefix}]`, ...args.map((arg) => String(arg))].join(' '))
+      log.warn([`[${prefix}]`, ...args.map(formatArg)].join(' '))
     },
-    info: (...args: any[]) => {
+    info: (...args: unknown[]) => {
       writeToFile('INFO', prefix, args)
-      log.info([`[${prefix}]`, ...args.map((arg) => String(arg))].join(' '))
+      log.info([`[${prefix}]`, ...args.map(formatArg)].join(' '))
     },
-    debug: (...args: any[]) => {
+    debug: (...args: unknown[]) => {
       writeToFile('DEBUG', prefix, args)
-      log.info([`[${prefix}]`, ...args.map((arg) => String(arg))].join(' '))
+      log.info([`[${prefix}]`, ...args.map(formatArg)].join(' '))
     },
   }
 }

package/src/session-handler.ts

@@ -13,7 +13,7 @@ import { formatPart } from './message-formatting.js'
 import { getOpencodeSystemMessage } from './system-message.js'
 import { createLogger } from './logger.js'
 import { isAbortError } from './utils.js'
-import { showAskUserQuestionDropdowns, cancelPendingQuestion } from './commands/ask-question.js'
+import { showAskUserQuestionDropdowns, cancelPendingQuestion, pendingQuestionContexts } from './commands/ask-question.js'
 import { showPermissionDropdown, cleanupPermissionContext } from './commands/permissions.js'
 
 const sessionLogger = createLogger('SESSION')
@@ -239,11 +239,10 @@ export async function handleOpencodeSession({
     }
   }
 
-  // Cancel any pending question tool if user sends a new message
+  // Cancel any pending question tool if user sends a new message (silently, no thread message)
   const questionCancelled = await cancelPendingQuestion(thread.id)
   if (questionCancelled) {
     sessionLogger.log(`[QUESTION] Cancelled pending question due to new message`)
-    await sendThreadMessage(thread, `⚠️ Previous question cancelled - processing your new message`)
   }
 
   const abortController = new AbortController()
@@ -433,7 +432,14 @@ export async function handleOpencodeSession({
           }
 
           if (part.type === 'step-start') {
-            stopTyping = startTyping()
+            // Don't start typing if user needs to respond to a question or permission
+            const hasPendingQuestion = [...pendingQuestionContexts.values()].some(
+              (ctx) => ctx.thread.id === thread.id,
+            )
+            const hasPendingPermission = pendingPermissions.has(thread.id)
+            if (!hasPendingQuestion && !hasPendingPermission) {
+              stopTyping = startTyping()
+            }
           }
 
           if (part.type === 'tool' && part.state.status === 'running') {
@@ -475,6 +481,12 @@ export async function handleOpencodeSession({
             await sendPartMessage(part)
           }
 
+          // Send text parts when complete (time.end is set)
+          // Text parts stream incrementally; only send when finished to avoid partial text
+          if (part.type === 'text' && part.time?.end) {
+            await sendPartMessage(part)
+          }
+
           if (part.type === 'step-finish') {
             for (const p of currentParts) {
               if (p.type !== 'step-start' && p.type !== 'step-finish') {
@@ -483,6 +495,12 @@ export async function handleOpencodeSession({
             }
             setTimeout(() => {
               if (abortController.signal.aborted) return
+              // Don't restart typing if user needs to respond to a question or permission
+              const hasPendingQuestion = [...pendingQuestionContexts.values()].some(
+                (ctx) => ctx.thread.id === thread.id,
+              )
+              const hasPendingPermission = pendingPermissions.has(thread.id)
+              if (hasPendingQuestion || hasPendingPermission) return
               stopTyping = startTyping()
             }, 300)
           }
@@ -527,6 +545,12 @@ export async function handleOpencodeSession({
             `Permission requested: permission=${permission.permission}, patterns=${permission.patterns.join(', ')}`,
           )
 
+          // Stop typing - user needs to respond now, not the bot
+          if (stopTyping) {
+            stopTyping()
+            stopTyping = null
+          }
+
           // Show dropdown instead of text message
           const { messageId, contextHash } = await showPermissionDropdown({
             thread,
@@ -569,6 +593,12 @@ export async function handleOpencodeSession({
             `Question requested: id=${questionRequest.id}, questions=${questionRequest.questions.length}`,
           )
 
+          // Stop typing - user needs to respond now, not the bot
+          if (stopTyping) {
+            stopTyping()
+            stopTyping = null
+          }
+
           // Flush any pending text/reasoning parts before showing the dropdown
           // This ensures text the LLM generated before the question tool is shown first
           for (const p of currentParts) {
@@ -584,6 +614,12 @@ export async function handleOpencodeSession({
             requestId: questionRequest.id,
             input: { questions: questionRequest.questions },
           })
+        } else if (event.type === 'session.idle') {
+          // Session is done processing - abort to signal completion
+          if (event.properties.sessionID === session.id) {
+            sessionLogger.log(`[SESSION IDLE] Session ${session.id} is idle, aborting`)
+            abortController.abort('finished')
+          }
         }
       }
     } catch (e) {

package/src/system-message.ts

@@ -66,5 +66,18 @@ headings are discouraged anyway. instead try to use bold text for titles which r
 ## diagrams
 
 you can create diagrams wrapping them in code blocks.
+
+## ending conversations with options
+
+IMPORTANT: At the end of each response, especially after completing a task or presenting a plan, use the question tool to offer the user clear options for what to do next.
+
+Examples:
+- After showing a plan: offer "Start implementing?" with Yes/No options
+- After completing edits: offer "Commit changes?" with Yes/No options
+- After debugging: offer "How to proceed?" with options like "Apply fix", "Investigate further", "Try different approach"
+
+The user can always select "Other" to type a custom response if the provided options don't fit their needs, or if the plan needs updating.
+
+This makes the interaction more guided and reduces friction for the user.
 `
 }

package/src/unnest-code-blocks.test.ts

@@ -223,3 +223,206 @@ test('handles empty list item with code', () => {
     "
   `)
 })
+
+test('numbered list with text after code block', () => {
+  const input = `1. First item
+   \`\`\`js
+   const a = 1
+   \`\`\`
+   Text after the code
+2. Second item`
+  const result = unnestCodeBlocksFromLists(input)
+  expect(result).toMatchInlineSnapshot(`
+    "1. First item
+
+    \`\`\`js
+    const a = 1
+    \`\`\`
+    - Text after the code
+    2. Second item"
+  `)
+})
+
+test('numbered list with multiple code blocks and text between', () => {
+  const input = `1. First item
+   \`\`\`js
+   const a = 1
+   \`\`\`
+   Middle text
+   \`\`\`python
+   b = 2
+   \`\`\`
+   Final text
+2. Second item`
+  const result = unnestCodeBlocksFromLists(input)
+  expect(result).toMatchInlineSnapshot(`
+    "1. First item
+
+    \`\`\`js
+    const a = 1
+    \`\`\`
+    - Middle text
+
+    \`\`\`python
+    b = 2
+    \`\`\`
+    - Final text
+    2. Second item"
+  `)
+})
+
+test('unordered list with multiple code blocks and text between', () => {
+  const input = `- First item
+  \`\`\`js
+  const a = 1
+  \`\`\`
+  Middle text
+  \`\`\`python
+  b = 2
+  \`\`\`
+  Final text
+- Second item`
+  const result = unnestCodeBlocksFromLists(input)
+  expect(result).toMatchInlineSnapshot(`
+    "- First item
+
+    \`\`\`js
+    const a = 1
+    \`\`\`
+    - Middle text
+
+    \`\`\`python
+    b = 2
+    \`\`\`
+    - Final text
+    - Second item"
+  `)
+})
+
+test('numbered list starting from 5', () => {
+  const input = `5. Fifth item
+   \`\`\`js
+   code
+   \`\`\`
+   Text after
+6. Sixth item`
+  const result = unnestCodeBlocksFromLists(input)
+  expect(result).toMatchInlineSnapshot(`
+    "5. Fifth item
+
+    \`\`\`js
+    code
+    \`\`\`
+    - Text after
+    6. Sixth item"
+  `)
+})
+
+test('deeply nested list with code', () => {
+  const input = `- Level 1
+  - Level 2
+    - Level 3
+      \`\`\`js
+      deep code
+      \`\`\`
+      Text after deep code
+    - Another level 3
+  - Back to level 2`
+  const result = unnestCodeBlocksFromLists(input)
+  expect(result).toMatchInlineSnapshot(`
+    "- Level 1
+    - Level 2
+    - Level 3
+
+    \`\`\`js
+    deep code
+    \`\`\`
+    - Text after deep code
+    - Another level 3- Back to level 2"
+  `)
+})
+
+test('nested numbered list inside unordered with code', () => {
+  const input = `- Unordered item
+  1. Nested numbered
+     \`\`\`js
+     code
+     \`\`\`
+     Text after
+  2. Second nested
+- Another unordered`
+  const result = unnestCodeBlocksFromLists(input)
+  expect(result).toMatchInlineSnapshot(`
+    "- Unordered item
+    1. Nested numbered
+
+    \`\`\`js
+    code
+    \`\`\`
+    - Text after
+    2. Second nested- Another unordered"
+  `)
+})
+
+test('code block at end of numbered item no text after', () => {
+  const input = `1. First with text
+   \`\`\`js
+   code here
+   \`\`\`
+2. Second item
+3. Third item`
+  const result = unnestCodeBlocksFromLists(input)
+  expect(result).toMatchInlineSnapshot(`
+    "1. First with text
+
+    \`\`\`js
+    code here
+    \`\`\`
+    2. Second item
+    3. Third item"
+  `)
+})
+
+test('multiple items each with code and text after', () => {
+  const input = `1. First
+   \`\`\`js
+   code1
+   \`\`\`
+   After first
+2. Second
+   \`\`\`python
+   code2
+   \`\`\`
+   After second
+3. Third no code`
+  const result = unnestCodeBlocksFromLists(input)
+  expect(result).toMatchInlineSnapshot(`
+    "1. First
+
+    \`\`\`js
+    code1
+    \`\`\`
+    - After first
+    2. Second
+
+    \`\`\`python
+    code2
+    \`\`\`
+    - After second
+    3. Third no code"
+  `)
+})
+
+test('code block immediately after list marker', () => {
+  const input = `1. \`\`\`js
+   immediate code
+   \`\`\`
+2. Normal item`
+  const result = unnestCodeBlocksFromLists(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`js
+    immediate code
+    \`\`\`
+    2. Normal item"
+  `)
+})

package/src/unnest-code-blocks.ts

@@ -41,11 +41,15 @@ function processListToken(list: Tokens.List): Segment[] {
 function processListItem(item: Tokens.ListItem, prefix: string): Segment[] {
   const segments: Segment[] = []
   let currentText: string[] = []
+  // Track if we've seen a code block - text after code uses continuation prefix
+  let seenCodeBlock = false
 
   const flushText = (): void => {
     const text = currentText.join('').trim()
     if (text) {
-      segments.push({ type: 'list-item', prefix, content: text })
+      // After a code block, use '-' as continuation prefix to avoid repeating numbers
+      const effectivePrefix = seenCodeBlock ? '- ' : prefix
+      segments.push({ type: 'list-item', prefix: effectivePrefix, content: text })
     }
     currentText = []
   }
@@ -59,6 +63,7 @@ function processListItem(item: Tokens.ListItem, prefix: string): Segment[] {
         type: 'code',
         content: '```' + lang + '\n' + codeToken.text + '\n```\n',
       })
+      seenCodeBlock = true
     } else if (token.type === 'list') {
       flushText()
       // Recursively process nested list - segments bubble up