kimaki 0.4.20 → 0.4.22

package/src/format-tables.test.ts

@@ -0,0 +1,440 @@
+import { test, expect } from 'vitest'
+import { formatMarkdownTables } from './format-tables.js'
+
+test('formats simple table', () => {
+  const input = `| Name | Age |
+| --- | --- |
+| Alice | 30 |
+| Bob | 25 |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Name  Age
+    ----- ---
+    Alice 30 
+    Bob   25 
+    \`\`\`
+    "
+  `)
+})
+
+test('formats table with varying column widths', () => {
+  const input = `| Item | Quantity | Price |
+| --- | --- | --- |
+| Apples | 10 | $5 |
+| Oranges | 3 | $2 |
+| Bananas with long name | 100 | $15.99 |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Item                   Quantity Price 
+    ---------------------- -------- ------
+    Apples                 10       $5    
+    Oranges                3        $2    
+    Bananas with long name 100      $15.99
+    \`\`\`
+    "
+  `)
+})
+
+test('strips bold formatting from cells', () => {
+  const input = `| Header | Value |
+| --- | --- |
+| **Bold text** | Normal |
+| Mixed **bold** text | Another |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Header          Value  
+    --------------- -------
+    Bold text       Normal 
+    Mixed bold text Another
+    \`\`\`
+    "
+  `)
+})
+
+test('strips italic formatting from cells', () => {
+  const input = `| Header | Value |
+| --- | --- |
+| *Italic text* | Normal |
+| _Also italic_ | Another |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Header      Value  
+    ----------- -------
+    Italic text Normal 
+    Also italic Another
+    \`\`\`
+    "
+  `)
+})
+
+test('extracts URL from links', () => {
+  const input = `| Name | Link |
+| --- | --- |
+| Google | [Click here](https://google.com) |
+| GitHub | [GitHub Home](https://github.com) |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Name   Link              
+    ------ ------------------
+    Google https://google.com
+    GitHub https://github.com
+    \`\`\`
+    "
+  `)
+})
+
+test('handles inline code in cells', () => {
+  const input = `| Function | Description |
+| --- | --- |
+| \`console.log\` | Logs to console |
+| \`Array.map\` | Maps array items |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Function    Description     
+    ----------- ----------------
+    console.log Logs to console 
+    Array.map   Maps array items
+    \`\`\`
+    "
+  `)
+})
+
+test('handles mixed formatting in single cell', () => {
+  const input = `| Description |
+| --- |
+| This has **bold**, *italic*, and \`code\` |
+| Also [a link](https://example.com) here |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Description                    
+    -------------------------------
+    This has bold, italic, and code
+    Also https://example.com here  
+    \`\`\`
+    "
+  `)
+})
+
+test('handles strikethrough text', () => {
+  const input = `| Status | Item |
+| --- | --- |
+| Done | ~~Deleted item~~ |
+| Active | Normal item |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Status Item        
+    ------ ------------
+    Done   Deleted item
+    Active Normal item 
+    \`\`\`
+    "
+  `)
+})
+
+test('preserves content before table', () => {
+  const input = `Here is some text before the table.
+
+| Col A | Col B |
+| --- | --- |
+| 1 | 2 |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "Here is some text before the table.
+
+    \`\`\`
+    Col A Col B
+    ----- -----
+    1     2    
+    \`\`\`
+    "
+  `)
+})
+
+test('preserves content after table', () => {
+  const input = `| Col A | Col B |
+| --- | --- |
+| 1 | 2 |
+
+And here is text after.`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Col A Col B
+    ----- -----
+    1     2    
+    \`\`\`
+    And here is text after."
+  `)
+})
+
+test('preserves content before and after table', () => {
+  const input = `Some intro text.
+
+| Name | Value |
+| --- | --- |
+| Key | 123 |
+
+Some outro text.`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "Some intro text.
+
+    \`\`\`
+    Name Value
+    ---- -----
+    Key  123  
+    \`\`\`
+    Some outro text."
+  `)
+})
+
+test('handles multiple tables in same content', () => {
+  const input = `First table:
+
+| A | B |
+| --- | --- |
+| 1 | 2 |
+
+Some text between.
+
+Second table:
+
+| X | Y | Z |
+| --- | --- | --- |
+| a | b | c |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "First table:
+
+    \`\`\`
+    A B
+    - -
+    1 2
+    \`\`\`
+    Some text between.
+
+    Second table:
+
+    \`\`\`
+    X Y Z
+    - - -
+    a b c
+    \`\`\`
+    "
+  `)
+})
+
+test('handles empty cells', () => {
+  const input = `| Name | Optional |
+| --- | --- |
+| Alice | |
+| | Bob |
+| | |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Name  Optional
+    ----- --------
+    Alice         
+          Bob     
+                  
+    \`\`\`
+    "
+  `)
+})
+
+test('handles single column table', () => {
+  const input = `| Items |
+| --- |
+| Apple |
+| Banana |
+| Cherry |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Items 
+    ------
+    Apple 
+    Banana
+    Cherry
+    \`\`\`
+    "
+  `)
+})
+
+test('handles single row table', () => {
+  const input = `| A | B | C | D |
+| --- | --- | --- | --- |
+| 1 | 2 | 3 | 4 |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    A B C D
+    - - - -
+    1 2 3 4
+    \`\`\`
+    "
+  `)
+})
+
+test('handles nested formatting', () => {
+  const input = `| Description |
+| --- |
+| **Bold with *nested italic* inside** |
+| *Italic with **nested bold** inside* |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Description                   
+    ------------------------------
+    Bold with nested italic inside
+    Italic with nested bold inside
+    \`\`\`
+    "
+  `)
+})
+
+test('handles image references', () => {
+  const input = `| Icon | Name |
+| --- | --- |
+| ![alt](https://example.com/icon.png) | Item 1 |
+| ![](https://cdn.test.com/img.jpg) | Item 2 |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Icon                         Name  
+    ---------------------------- ------
+    https://example.com/icon.png Item 1
+    https://cdn.test.com/img.jpg Item 2
+    \`\`\`
+    "
+  `)
+})
+
+test('preserves code blocks alongside tables', () => {
+  const input = `Some code:
+
+\`\`\`js
+const x = 1
+\`\`\`
+
+A table:
+
+| Key | Value |
+| --- | --- |
+| a | 1 |
+
+More code:
+
+\`\`\`python
+print("hello")
+\`\`\``
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "Some code:
+
+    \`\`\`js
+    const x = 1
+    \`\`\`
+
+    A table:
+
+    \`\`\`
+    Key Value
+    --- -----
+    a   1    
+    \`\`\`
+    More code:
+
+    \`\`\`python
+    print("hello")
+    \`\`\`"
+  `)
+})
+
+test('handles content without tables', () => {
+  const input = `Just some regular markdown.
+
+- List item 1
+- List item 2
+
+**Bold text** and *italic*.`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "Just some regular markdown.
+
+    - List item 1
+    - List item 2
+
+    **Bold text** and *italic*."
+  `)
+})
+
+test('handles complex real-world table', () => {
+  const input = `## API Endpoints
+
+| Method | Endpoint | Description | Auth |
+| --- | --- | --- | --- |
+| GET | \`/api/users\` | List all users | [Bearer token](https://docs.example.com/auth) |
+| POST | \`/api/users\` | Create **new** user | Required |
+| DELETE | \`/api/users/:id\` | ~~Remove~~ *Deactivate* user | Admin only |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "## API Endpoints
+
+    \`\`\`
+    Method Endpoint       Description            Auth                         
+    ------ -------------- ---------------------- -----------------------------
+    GET    /api/users     List all users         https://docs.example.com/auth
+    POST   /api/users     Create new user        Required                     
+    DELETE /api/users/:id Remove Deactivate user Admin only                   
+    \`\`\`
+    "
+  `)
+})
+
+test('handles unicode content', () => {
+  const input = `| Emoji | Name | Country |
+| --- | --- | --- |
+| 🍎 | Apple | 日本 |
+| 🍊 | Orange | España |
+| 🍌 | Banana | Ελλάδα |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Emoji Name   Country
+    ----- ------ -------
+    🍎    Apple  日本     
+    🍊    Orange España 
+    🍌    Banana Ελλάδα 
+    \`\`\`
+    "
+  `)
+})
+
+test('handles numbers and special characters', () => {
+  const input = `| Price | Discount | Final |
+| --- | --- | --- |
+| $100.00 | -15% | $85.00 |
+| €50,00 | -10% | €45,00 |
+| £75.99 | N/A | £75.99 |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Price   Discount Final 
+    ------- -------- ------
+    $100.00 -15%     $85.00
+    €50,00  -10%     €45,00
+    £75.99  N/A      £75.99
+    \`\`\`
+    "
+  `)
+})

package/src/format-tables.ts

@@ -0,0 +1,106 @@
+import { Lexer, type Token, type Tokens } from 'marked'
+
+export function formatMarkdownTables(markdown: string): string {
+  const lexer = new Lexer()
+  const tokens = lexer.lex(markdown)
+
+  let result = ''
+  for (const token of tokens) {
+    if (token.type === 'table') {
+      result += formatTableToken(token as Tokens.Table)
+    } else {
+      result += token.raw
+    }
+  }
+  return result
+}
+
+function formatTableToken(table: Tokens.Table): string {
+  const headers = table.header.map((cell) => {
+    return extractCellText(cell.tokens)
+  })
+  const rows = table.rows.map((row) => {
+    return row.map((cell) => {
+      return extractCellText(cell.tokens)
+    })
+  })
+
+  const columnWidths = calculateColumnWidths(headers, rows)
+  const lines: string[] = []
+
+  lines.push(formatRow(headers, columnWidths))
+  lines.push(formatSeparator(columnWidths))
+  for (const row of rows) {
+    lines.push(formatRow(row, columnWidths))
+  }
+
+  return '```\n' + lines.join('\n') + '\n```\n'
+}
+
+function extractCellText(tokens: Token[]): string {
+  const parts: string[] = []
+  for (const token of tokens) {
+    parts.push(extractTokenText(token))
+  }
+  return parts.join('').trim()
+}
+
+function extractTokenText(token: Token): string {
+  switch (token.type) {
+    case 'text':
+    case 'codespan':
+    case 'escape':
+      return token.text
+    case 'link':
+      return token.href
+    case 'image':
+      return token.href
+    case 'strong':
+    case 'em':
+    case 'del':
+      return token.tokens ? extractCellText(token.tokens) : token.text
+    case 'br':
+      return ' '
+    default: {
+      const tokenAny = token as { tokens?: Token[]; text?: string }
+      if (tokenAny.tokens && Array.isArray(tokenAny.tokens)) {
+        return extractCellText(tokenAny.tokens)
+      }
+      if (typeof tokenAny.text === 'string') {
+        return tokenAny.text
+      }
+      return ''
+    }
+  }
+}
+
+function calculateColumnWidths(
+  headers: string[],
+  rows: string[][],
+): number[] {
+  const widths = headers.map((h) => {
+    return h.length
+  })
+  for (const row of rows) {
+    for (let i = 0; i < row.length; i++) {
+      const cell = row[i] ?? ''
+      widths[i] = Math.max(widths[i] ?? 0, cell.length)
+    }
+  }
+  return widths
+}
+
+function formatRow(cells: string[], widths: number[]): string {
+  const paddedCells = cells.map((cell, i) => {
+    return cell.padEnd(widths[i] ?? 0)
+  })
+  return paddedCells.join(' ')
+}
+
+function formatSeparator(widths: number[]): string {
+  return widths
+    .map((w) => {
+      return '-'.repeat(w)
+    })
+    .join(' ')
+}

package/src/markdown.ts

@@ -1,6 +1,6 @@
 import type { OpencodeClient } from '@opencode-ai/sdk'
-import { format } from 'date-fns'
 import * as yaml from 'js-yaml'
+import { formatDateTime } from './utils.js'
 import { extractNonXmlContent } from './xml.js'
 
 export class ShareMarkdown {
@@ -62,10 +62,10 @@ export class ShareMarkdown {
         lines.push('## Session Information')
         lines.push('')
         lines.push(
-          `- **Created**: ${format(new Date(session.time.created), 'MMM d, yyyy, h:mm a')}`,
+          `- **Created**: ${formatDateTime(new Date(session.time.created))}`,
         )
         lines.push(
-          `- **Updated**: ${format(new Date(session.time.updated), 'MMM d, yyyy, h:mm a')}`,
+          `- **Updated**: ${formatDateTime(new Date(session.time.updated))}`,
         )
         if (session.version) {
           lines.push(`- **OpenCode Version**: v${session.version}`)

package/src/tools.ts

@@ -11,9 +11,9 @@ import {
 import { createLogger } from './logger.js'
 
 const toolsLogger = createLogger('TOOLS')
-import { formatDistanceToNow } from 'date-fns'
 
 import { ShareMarkdown } from './markdown.js'
+import { formatDistanceToNow } from './utils.js'
 import pc from 'picocolors'
 import {
   initializeOpencodeForDirectory,
@@ -232,9 +232,7 @@ export async function getTools({
             id: session.id,
             folder: session.directory,
             status,
-            finishedAt: formatDistanceToNow(new Date(finishedAt), {
-              addSuffix: true,
-            }),
+            finishedAt: formatDistanceToNow(new Date(finishedAt)),
             title: session.title,
             prompt: session.title,
           }

package/src/utils.ts

@@ -75,3 +75,40 @@ export function isAbortError(
     (error instanceof DOMException && error.name === 'AbortError')
   )
 }
+
+const rtf = new Intl.RelativeTimeFormat('en', { numeric: 'auto' })
+
+const TIME_DIVISIONS: Array<{ amount: number; name: Intl.RelativeTimeFormatUnit }> = [
+  { amount: 60, name: 'seconds' },
+  { amount: 60, name: 'minutes' },
+  { amount: 24, name: 'hours' },
+  { amount: 7, name: 'days' },
+  { amount: 4.34524, name: 'weeks' },
+  { amount: 12, name: 'months' },
+  { amount: Number.POSITIVE_INFINITY, name: 'years' },
+]
+
+export function formatDistanceToNow(date: Date): string {
+  let duration = (date.getTime() - Date.now()) / 1000
+
+  for (const division of TIME_DIVISIONS) {
+    if (Math.abs(duration) < division.amount) {
+      return rtf.format(Math.round(duration), division.name)
+    }
+    duration /= division.amount
+  }
+  return rtf.format(Math.round(duration), 'years')
+}
+
+const dtf = new Intl.DateTimeFormat('en-US', {
+  month: 'short',
+  day: 'numeric',
+  year: 'numeric',
+  hour: 'numeric',
+  minute: '2-digit',
+  hour12: true,
+})
+
+export function formatDateTime(date: Date): string {
+  return dtf.format(date)
+}