@assistkick/create 1.2.0 → 1.3.0

package/templates/assistkick-product-system/packages/shared/db/migrations/meta/_journal.json

@@ -8,6 +8,20 @@
       "when": 1772730355833,
       "tag": "0000_dashing_gorgon",
       "breakpoints": true
+    },
+    {
+      "idx": 1,
+      "version": "6",
+      "when": 1772802625250,
+      "tag": "0001_vengeful_wallop",
+      "breakpoints": true
+    },
+    {
+      "idx": 2,
+      "version": "6",
+      "when": 1772807644324,
+      "tag": "0002_greedy_excalibur",
+      "breakpoints": true
     }
   ]
 }

package/templates/assistkick-product-system/packages/shared/db/schema.ts

@@ -119,6 +119,10 @@ export const projects = sqliteTable('projects', {
   name: text('name').notNull(),
   isDefault: integer('is_default').notNull().default(0),
   archivedAt: text('archived_at'),
+  repoUrl: text('repo_url'),
+  githubInstallationId: text('github_installation_id'),
+  githubRepoFullName: text('github_repo_full_name'),
+  baseBranch: text('base_branch'),
   createdAt: text('created_at').notNull(),
   updatedAt: text('updated_at').notNull(),
 });
@@ -131,6 +135,7 @@ export const pipelineState = sqliteTable('pipeline_state', {
   tasksJson: text('tasks_json'),
   toolCallsJson: text('tool_calls_json'),
   workSummariesJson: text('work_summaries_json'),
+  stageStatsJson: text('stage_stats_json'),
   error: text('error'),
   updatedAt: text('updated_at').notNull(),
   projectId: text('project_id'),

package/templates/assistkick-product-system/packages/shared/lib/claude-service.ts

@@ -131,13 +131,62 @@ export const emitToolUseEvents = (jsonStr, callback) => {
   }
 };
 
+/**
+ * Extract result event metadata from a stream-json line and invoke a callback.
+ * Fires once when the result event is encountered, providing usage stats.
+ */
+export const emitResultEvent = (jsonStr, callback) => {
+  try {
+    const event = JSON.parse(jsonStr);
+    if (event.type === 'result') {
+      const model = event.model
+        ?? (event.modelUsage ? Object.keys(event.modelUsage)[0] : null);
+      // Extract contextWindow from modelUsage (e.g. modelUsage["claude-..."].contextWindow)
+      let contextWindow: number | null = null;
+      if (event.modelUsage) {
+        const modelKey = model ?? Object.keys(event.modelUsage)[0];
+        if (modelKey && event.modelUsage[modelKey]?.contextWindow) {
+          contextWindow = event.modelUsage[modelKey].contextWindow;
+        }
+      }
+      callback({
+        costUsd: event.cost_usd ?? event.total_cost_usd ?? null,
+        durationMs: event.duration_ms ?? null,
+        numTurns: event.num_turns ?? null,
+        stopReason: event.stop_reason ?? null,
+        usage: event.usage ?? null,
+        model: model ?? null,
+        contextWindow,
+      });
+    }
+  } catch {
+    // Not valid JSON — skip silently
+  }
+};
+
+/**
+ * Extract per-turn usage from an assistant event's message.usage and invoke a callback.
+ * Each assistant event contains usage for THAT turn only. The callback is called
+ * for every assistant event, so the last call represents the final turn's usage.
+ */
+export const emitAssistantUsage = (jsonStr, callback) => {
+  try {
+    const event = JSON.parse(jsonStr);
+    if (event.type === 'assistant' && event.message?.usage) {
+      callback(event.message.usage);
+    }
+  } catch {
+    // Not valid JSON — skip silently
+  }
+};
+
 /**
  * Create a Claude CLI invocation service.
  * @param {{ verbose: boolean, log: function }} opts
  * @returns {{ spawnClaude: function, spawnCommand: function }}
  */
 export const createClaudeService = ({ verbose = false, log: logFn }) => {
-  const spawnClaude = (prompt, cwd, label = 'claude', { onToolUse } = {}) => new Promise((resolve, reject) => {
+  const spawnClaude = (prompt, cwd, label = 'claude', { onToolUse, onResult, onTurnUsage } = {}) => new Promise((resolve, reject) => {
     const promptPreview = prompt.slice(0, 100).replace(/\n/g, '\\n');
     logFn('CLAUDE', `Spawning ${label} in ${cwd} — prompt length: ${prompt.length} chars`);
     logFn('CLAUDE', `Prompt preview: "${promptPreview}..."`);
@@ -169,6 +218,8 @@ export const createClaudeService = ({ verbose = false, log: logFn }) => {
           if (line.trim()) {
             formatStreamEvent(line.trim(), tag);
             if (onToolUse) emitToolUseEvents(line.trim(), onToolUse);
+            if (onResult) emitResultEvent(line.trim(), onResult);
+            if (onTurnUsage) emitAssistantUsage(line.trim(), onTurnUsage);
           }
         }
       }
@@ -192,6 +243,8 @@ export const createClaudeService = ({ verbose = false, log: logFn }) => {
       if (verbose && lineBuf.trim()) {
         formatStreamEvent(lineBuf.trim(), tag);
         if (onToolUse) emitToolUseEvents(lineBuf.trim(), onToolUse);
+        if (onResult) emitResultEvent(lineBuf.trim(), onResult);
+        if (onTurnUsage) emitAssistantUsage(lineBuf.trim(), onTurnUsage);
       }
       if (code === 0) {
         const result = verbose ? extractResultText(stdout) : stdout;

package/templates/assistkick-product-system/packages/shared/lib/git_workflow.ts

@@ -107,4 +107,29 @@ export class GitWorkflow {
     await this.claudeService.spawnCommand('git', ['stash', 'pop'], this.projectRoot);
     this.log('PIPELINE', `Restored stashed local changes`);
   };
+
+  /** Pull the default branch before creating a worktree to ensure up-to-date base. */
+  pullDefaultBranch = async (branch?: string) => {
+    const targetBranch = branch || 'main';
+    this.log('PIPELINE', `Pulling ${targetBranch} to ensure up-to-date base...`);
+    try {
+      await this.claudeService.spawnCommand('git', ['pull', 'origin', targetBranch], this.projectRoot);
+      this.log('PIPELINE', `Pull succeeded for ${targetBranch}`);
+    } catch (err: any) {
+      this.log('PIPELINE', `Pull failed (non-fatal): ${err.message}`);
+    }
+  };
+
+  /** Push the current branch to the remote after a successful merge. */
+  pushToRemote = async (branch?: string) => {
+    const targetBranch = branch || 'main';
+    this.log('PIPELINE', `Pushing ${targetBranch} to remote...`);
+    await this.claudeService.spawnCommand('git', ['push', 'origin', targetBranch], this.projectRoot);
+    this.log('PIPELINE', `Push succeeded for ${targetBranch}`);
+  };
+
+  /** Set the remote URL (used for authenticated push/pull with tokens). */
+  setRemoteUrl = async (url: string, remote = 'origin') => {
+    await this.claudeService.spawnCommand('git', ['remote', 'set-url', remote, url], this.projectRoot);
+  };
 }

package/templates/assistkick-product-system/packages/shared/lib/pipeline-state-store.ts

@@ -25,6 +25,7 @@ export class PipelineStateStore {
       tasksJson: state.tasks ? JSON.stringify(state.tasks.items || []) : null,
       toolCallsJson: state.toolCalls ? JSON.stringify(state.toolCalls) : null,
       workSummariesJson: state.workSummaries ? JSON.stringify(state.workSummaries) : null,
+      stageStatsJson: state.stageStats ? JSON.stringify(state.stageStats) : null,
       error: state.error || null,
       updatedAt: new Date().toISOString(),
       projectId: projectId || null,
@@ -40,6 +41,7 @@ export class PipelineStateStore {
           tasksJson: row.tasksJson,
           toolCallsJson: row.toolCallsJson,
           workSummariesJson: row.workSummariesJson,
+          stageStatsJson: row.stageStatsJson,
           error: row.error,
           updatedAt: row.updatedAt,
           projectId: row.projectId,
@@ -62,6 +64,7 @@ export class PipelineStateStore {
     const tasks = row.tasksJson ? JSON.parse(row.tasksJson) : [];
     const toolCalls = row.toolCallsJson ? JSON.parse(row.toolCallsJson) : null;
     const rawSummaries = row.workSummariesJson ? JSON.parse(row.workSummariesJson) : [];
+    const stageStats = row.stageStatsJson ? JSON.parse(row.stageStatsJson) : null;
 
     // Migrate old flat filesChanged format to categorized format
     const workSummaries = rawSummaries.map((ws) => {
@@ -89,6 +92,7 @@ export class PipelineStateStore {
       } : undefined,
       toolCalls: toolCalls && toolCalls.total > 0 ? toolCalls : undefined,
       workSummaries: workSummaries.length > 0 ? workSummaries : undefined,
+      stageStats: stageStats || undefined,
       updatedAt: row.updatedAt,
     };
   };