runwork 0.17.1 → 0.18.0

package/LICENSE

@@ -1,11 +1,11 @@
-Copyright (c) 2025-2026 Runwork All rights reserved.
+Copyright (c) 2025-2026 Runwork, Inc. All rights reserved.
 
 This software and associated documentation files (the "Software") are the
-proprietary and confidential property of Runwork
+proprietary and confidential property of Runwork, Inc.
 
 No part of the Software may be copied, modified, distributed, sublicensed,
 sold, or otherwise made available to any third party without the prior
-written consent of Runwork
+written consent of Runwork, Inc.
 
 You may use the Software solely as a tool to interact with the Runwork
 platform in accordance with the Runwork Terms of Service.

package/bundled-types/core-scheduler.d.ts

@@ -44,6 +44,15 @@ export interface JobResult {
     /** Additional result data (varies by job) */
     [key: string]: unknown;
 }
+/**
+ * Wire-safe schedule definition: what crosses the RPC boundary into
+ * SchedulerDO. Deliberately excludes the handler function; over DO RPC a
+ * function arrives as a callback stub, and invoking a stubbed handler
+ * serializes JobContext back to the calling isolate, where env bindings (R2
+ * buckets, DO namespaces) cannot be serialized (AGENTCLI-6). Handlers are
+ * bound inside the DO from its own isolate's module registry.
+ */
+export type ScheduledJobDefinition = Omit<ScheduledJob, 'handler'> & Partial<Pick<ScheduledJob, 'handler'>>;
 export interface JobLogger {
     info(message: string, data?: Record<string, unknown>): void;
     warn(message: string, data?: Record<string, unknown>): void;
@@ -134,7 +143,7 @@ export declare class SchedulerDO extends DurableObject<Env> {
      * Initialize the job scheduler with job definitions.
      * Can be called again after HMR to sync new/changed job definitions.
      */
-    initializeJobScheduler(jobs: ScheduledJob[]): Promise<void>;
+    initializeJobScheduler(jobs: ScheduledJobDefinition[]): Promise<void>;
     /**
      * Handle alarm - execute due jobs
      */

package/dist/index.js

@@ -5811,6 +5811,15 @@ export interface JobResult {
     /** Additional result data (varies by job) */
     [key: string]: unknown;
 }
+/**
+ * Wire-safe schedule definition: what crosses the RPC boundary into
+ * SchedulerDO. Deliberately excludes the handler function; over DO RPC a
+ * function arrives as a callback stub, and invoking a stubbed handler
+ * serializes JobContext back to the calling isolate, where env bindings (R2
+ * buckets, DO namespaces) cannot be serialized (AGENTCLI-6). Handlers are
+ * bound inside the DO from its own isolate's module registry.
+ */
+export type ScheduledJobDefinition = Omit<ScheduledJob, 'handler'> & Partial<Pick<ScheduledJob, 'handler'>>;
 export interface JobLogger {
     info(message: string, data?: Record<string, unknown>): void;
     warn(message: string, data?: Record<string, unknown>): void;
@@ -5901,7 +5910,7 @@ export declare class SchedulerDO extends DurableObject<Env> {
      * Initialize the job scheduler with job definitions.
      * Can be called again after HMR to sync new/changed job definitions.
      */
-    initializeJobScheduler(jobs: ScheduledJob[]): Promise<void>;
+    initializeJobScheduler(jobs: ScheduledJobDefinition[]): Promise<void>;
     /**
      * Handle alarm - execute due jobs
      */
@@ -7561,7 +7570,7 @@ function createKeyboardListener() {
 }
 
 // src/generated/version.ts
-var VERSION = "0.17.1";
+var VERSION = "0.18.0";
 
 // src/commands/dev.ts
 var exports_dev = {};
@@ -8921,6 +8930,21 @@ var deployCommand = new Command5("deploy").description("Deploy the current app t
   }
   const deployedSha = getHeadSha(cwd);
   const finishedAt = new Date().toISOString();
+  const shaVerdict = assessBuiltSha(deployedSha, result.builtFromSha);
+  if (shaVerdict === "mismatch") {
+    const detail = `The platform built this deploy from ${result.builtFromSha.slice(0, 7)} but your pushed HEAD is ${deployedSha.slice(0, 7)}. Production is NOT running your latest code.`;
+    writeDeployStatus(cwd, { state: "failed", startedAt: childStartedAt, finishedAt, error: detail });
+    deployFinalized = true;
+    if (useJson) {
+      jsonOut(buildErrorResponse("deploy", "Deployed artifact does not match pushed commit", detail, [
+        "Run `runwork dev --restart --detach` to resync the build sandbox, then retry `runwork deploy`",
+        "Verify with `runwork logs --production --once` which version is actually serving"
+      ]));
+      process.exit(1);
+    }
+    console.error(`Deploy verification failed: ${detail}`);
+    process.exit(1);
+  }
   if (deployedSha) {
     writeDeployState(cwd, { sha: deployedSha, deployedAt: finishedAt, url: deploymentUrl });
   }
@@ -8937,7 +8961,9 @@ var deployCommand = new Command5("deploy").description("Deploy the current app t
         deployed,
         url: deploymentUrl,
         appName: config.appName,
-        deployedSha
+        deployedSha,
+        builtFromSha: result.builtFromSha,
+        shaVerified: shaVerdict === "match"
       },
       guide: buildDeployGuide(),
       ...deployGuardWarning ? { warning: deployGuardWarning } : {}
@@ -8947,8 +8973,13 @@ var deployCommand = new Command5("deploy").description("Deploy the current app t
   }
   console.log(`Deployed: ${deploymentUrl}`);
   if (deployedSha)
-    console.log(dim(`Commit: ${deployedSha.slice(0, 7)}`));
+    console.log(dim(`Commit: ${deployedSha.slice(0, 7)}${shaVerdict === "match" ? " (verified)" : shaVerdict === "unverified" ? " (provenance unverified by server)" : ""}`));
 });
+function assessBuiltSha(localSha, builtFromSha) {
+  if (!localSha || !builtFromSha)
+    return "unverified";
+  return builtFromSha === localSha ? "match" : "mismatch";
+}
 function printDeployStatus(cwd, useJson) {
   const status = readDeployStatus(cwd);
   const summary = getDeploySummary(cwd);
@@ -9950,7 +9981,7 @@ Used by your team (${teamOnly.length} more):
         console.log(`  ${t.canonicalId} - Used by ${display}`);
       }
       console.log(`
-  Connect at https://runwork.ai/workspace-settings?section=integrations`);
+  Connect at https://runwork.ai/integrations`);
     }
   } catch (err) {
     console.error("Failed to list integrations:", err instanceof Error ? err.message : err);
@@ -11415,6 +11446,22 @@ function formatCombinedDigest(sessions, opts = { days: 7 }) {
 `);
 }
 
+// src/agents/utils/skill-name.ts
+function canonicalSkillName(raw) {
+  const afterPrefix = raw.includes(":") ? raw.slice(raw.lastIndexOf(":") + 1) : raw;
+  return afterPrefix.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+}
+function skillNameFromPath(path2) {
+  const trimmed = path2.trim().replace(/\/SKILL\.md$/i, "");
+  if (!trimmed.includes("/") || /[<>]/.test(trimmed))
+    return null;
+  const segment = trimmed.replace(/\/+$/, "").split("/").pop();
+  if (!segment)
+    return null;
+  const canonical = canonicalSkillName(segment);
+  return canonical || null;
+}
+
 // src/agents/utils/json-config.ts
 import { readFileSync as readFileSync22, writeFileSync as writeFileSync14, mkdirSync as mkdirSync13, existsSync as existsSync25 } from "fs";
 import { dirname as dirname5 } from "path";
@@ -12138,6 +12185,7 @@ ${instructions}`;
       let outputTokens = 0;
       let cacheReadTokens = 0;
       let latestActivityMs = 0;
+      const activeDays = new Set;
       const seenEntries = new Set;
       let cwdEntries;
       try {
@@ -12191,6 +12239,7 @@ ${instructions}`;
             sessionHadActivity = true;
             if (ts > latestActivityMs)
               latestActivityMs = ts;
+            activeDays.add(new Date(ts).toISOString().slice(0, 10));
             const type = entry.type;
             if (type === "user" || type === "assistant") {
               const msg = entry.message;
@@ -12243,6 +12292,7 @@ ${instructions}`;
         aiLinesAdded: 0,
         aiLinesRemoved: 0,
         lastActiveAt: latestActivityMs > 0 ? new Date(latestActivityMs).toISOString() : null,
+        activeDays: [...activeDays].sort(),
         extra: { inputTokens, outputTokens, cacheReadTokens }
       };
     } catch {
@@ -12347,7 +12397,7 @@ ${instructions}`;
           } catch {
             continue;
           }
-          let pendingCommand = null;
+          const pendingToolUses = [];
           for (const line of content.split(`
 `)) {
             if (!line)
@@ -12365,39 +12415,48 @@ ${instructions}`;
             if (!Number.isFinite(ts) || ts <= sinceMs)
               continue;
             const type = entry.type;
-            if (type === "assistant") {
-              const msg = entry.message;
-              if (msg && typeof msg === "object") {
-                const blocks = Array.isArray(msg.content) ? msg.content : [];
-                for (const block of blocks) {
-                  if (block && block.type === "tool_use" && block.name === "Skill") {
-                    const input = block.input;
-                    if (input && typeof input.skill === "string") {
-                      recordSkill(input.skill, ts);
-                    }
+            const msg = entry.message;
+            if (type === "assistant" && msg && typeof msg === "object") {
+              const blocks = Array.isArray(msg.content) ? msg.content : [];
+              for (const block of blocks) {
+                if (block && block.type === "tool_use" && block.name === "Skill") {
+                  const input = block.input;
+                  if (input && typeof input.skill === "string") {
+                    const name = canonicalSkillName(input.skill);
+                    if (name)
+                      pendingToolUses.push({ name, ts });
                   }
                 }
               }
             }
-            if (type === "user") {
-              const msg = entry.message;
-              const msgContent = msg?.content;
-              const text2 = typeof msgContent === "string" ? msgContent : "";
-              if (pendingCommand && text2.startsWith("Base directory for this skill:")) {
-                recordSkill(pendingCommand.name, pendingCommand.ts);
-                pendingCommand = null;
-                continue;
-              }
-              if (pendingCommand && type === "user") {
-                pendingCommand = null;
+            if (type === "user" && msg && typeof msg === "object") {
+              const texts = [];
+              if (typeof msg.content === "string") {
+                texts.push(msg.content);
+              } else if (Array.isArray(msg.content)) {
+                for (const block of msg.content) {
+                  if (block && typeof block === "object" && block.type === "text" && typeof block.text === "string") {
+                    texts.push(block.text);
+                  }
+                }
               }
-              const match = text2.match(/<command-name>\/?([^<]+)<\/command-name>/);
-              if (match) {
-                const cmdName = match[1].replace(/^\//, "");
-                pendingCommand = { name: cmdName, ts };
+              for (const text2 of texts) {
+                const m = text2.match(/^Base directory for this skill: (.+)$/m);
+                if (!m)
+                  continue;
+                const name = skillNameFromPath(m[1]);
+                if (!name)
+                  continue;
+                const pendingIdx = pendingToolUses.findIndex((p) => p.name === name);
+                if (pendingIdx >= 0)
+                  pendingToolUses.splice(pendingIdx, 1);
+                recordSkill(name, ts);
               }
             }
           }
+          for (const pending of pendingToolUses) {
+            recordSkill(pending.name, pending.ts);
+          }
         }
       }
       if (skillCounts.size === 0)
@@ -12971,11 +13030,14 @@ class ClaudeDesktopAdapter {
       const modelsUsed = new Set;
       let maxMcpTools = 0;
       const agentSessionsDir = join23(claudeAppDir, "local-agent-mode-sessions");
+      const activeDays = new Set;
       if (existsSync29(agentSessionsDir)) {
         this.walkSessionDirs(agentSessionsDir, sinceMs, (session) => {
           const sessionTime = session.lastActivityAt ?? session.createdAt ?? 0;
-          if (sessionTime > sinceMs)
+          if (sessionTime > sinceMs) {
             sessionCount++;
+            activeDays.add(new Date(sessionTime).toISOString().slice(0, 10));
+          }
           if (sessionTime > latestActivity)
             latestActivity = sessionTime;
           if (session.model)
@@ -12991,8 +13053,10 @@ class ClaudeDesktopAdapter {
       if (existsSync29(codeSessionsDir)) {
         this.walkSessionDirs(codeSessionsDir, sinceMs, (session) => {
           const sessionTime = session.lastActivityAt ?? session.createdAt ?? 0;
-          if (sessionTime > sinceMs)
+          if (sessionTime > sinceMs) {
             sessionCount++;
+            activeDays.add(new Date(sessionTime).toISOString().slice(0, 10));
+          }
           if (sessionTime > latestActivity)
             latestActivity = sessionTime;
           if (session.model)
@@ -13025,6 +13089,7 @@ class ClaudeDesktopAdapter {
         aiLinesAdded: 0,
         aiLinesRemoved: 0,
         lastActiveAt: latestActivity > 0 ? new Date(latestActivity).toISOString() : null,
+        activeDays: activeDays.size > 0 ? [...activeDays].sort() : undefined,
         modelsUsed: Array.from(modelsUsed),
         mcpToolCount: maxMcpTools > 0 ? maxMcpTools : undefined,
         extra: scheduledTaskRuns > 0 ? { scheduledTaskRuns } : undefined
@@ -13033,46 +13098,6 @@ class ClaudeDesktopAdapter {
       return null;
     }
   }
-  async readSessionDigests(sinceISO) {
-    try {
-      const os2 = platform3();
-      const claudeAppDir = os2 === "darwin" ? join23(homedir6(), "Library", "Application Support", "Claude") : os2 === "win32" ? join23(process.env.APPDATA || join23(homedir6(), "AppData", "Roaming"), "Claude") : join23(homedir6(), ".config", "Claude");
-      const sessionsDir = join23(claudeAppDir, "claude-code-sessions");
-      if (!existsSync29(sessionsDir))
-        return null;
-      const sinceMs = sinceISO ? new Date(sinceISO).getTime() : 0;
-      let files;
-      try {
-        files = readdirSync6(sessionsDir).filter((f) => f.endsWith(".jsonl"));
-      } catch {
-        return null;
-      }
-      const digests = [];
-      for (const file of files) {
-        const filePath = join23(sessionsDir, file);
-        let stat;
-        try {
-          stat = statSync4(filePath);
-        } catch {
-          continue;
-        }
-        if (stat.mtimeMs <= sinceMs)
-          continue;
-        let content;
-        try {
-          content = readFileSync25(filePath, "utf-8");
-        } catch {
-          continue;
-        }
-        const digest = extractClaudeJsonlSession(content, this.slug, file.replace(/\.jsonl$/, ""));
-        if (digest)
-          digests.push(digest);
-      }
-      return digests;
-    } catch {
-      return null;
-    }
-  }
   async readVersion() {
     try {
       const os2 = platform3();
@@ -13093,53 +13118,6 @@ class ClaudeDesktopAdapter {
       return null;
     }
   }
-  async readSkillUsage(lastSyncAt) {
-    try {
-      const baseDir = getCoworkBaseDir();
-      if (!existsSync29(baseDir))
-        return null;
-      const sinceMs = lastSyncAt ? new Date(lastSyncAt).getTime() : 0;
-      const skillCounts = new Map;
-      const agentSessionsDir = baseDir;
-      this.walkSessionDirs(agentSessionsDir, sinceMs, (session) => {
-        const sessionTime = session.lastActivityAt ?? session.createdAt ?? 0;
-        if (sessionTime <= sinceMs)
-          return;
-        const mcpTools = session.enabledMcpTools;
-        if (!mcpTools || typeof mcpTools !== "object")
-          return;
-        for (const toolName of Object.keys(mcpTools)) {
-          const skillMatch = toolName.match(/skill_([A-Za-z0-9_]+)/);
-          if (!skillMatch)
-            continue;
-          const rawName = skillMatch[1].replace(/_/g, " ").trim();
-          if (!rawName)
-            continue;
-          const existing = skillCounts.get(rawName);
-          if (existing) {
-            existing.count++;
-            if (sessionTime > existing.lastTs)
-              existing.lastTs = sessionTime;
-          } else {
-            skillCounts.set(rawName, { count: 1, lastTs: sessionTime });
-          }
-        }
-      });
-      if (skillCounts.size === 0)
-        return null;
-      const results = [];
-      for (const [skillName, { count, lastTs }] of skillCounts) {
-        results.push({
-          skillName,
-          count,
-          lastUsedAt: new Date(lastTs).toISOString()
-        });
-      }
-      return results;
-    } catch {
-      return null;
-    }
-  }
   walkSessionDirs(baseDir, _sinceMs, onSession) {
     try {
       for (const orgDir of readdirSync6(baseDir)) {
@@ -13420,14 +13398,18 @@ ${instructions}`;
     try {
       const sinceMs = lastSyncAt ? new Date(lastSyncAt).getTime() : 0;
       const globalDbPath = this.globalStorageDbPath();
-      let sessionCount = 0;
+      let newComposersWithoutId = 0;
+      const activeComposerIds = new Set;
+      const activeDays = new Set;
+      let messageCount = 0;
+      let toolCallCount = 0;
       let totalLinesAdded = 0;
       let totalLinesRemoved = 0;
       let latestActivity = 0;
       let agenticSessions = 0;
       let chatSessions = 0;
       if (existsSync30(globalDbPath)) {
-        const composerResult = queryReadonlySqlite(globalDbPath, `SELECT value FROM cursorDiskKV WHERE key LIKE 'composerData-%'`);
+        const composerResult = queryReadonlySqlite(globalDbPath, `SELECT value FROM cursorDiskKV WHERE key LIKE 'composerData:%'`);
         if (composerResult) {
           for (const line of composerResult.split(`
 `)) {
@@ -13437,7 +13419,11 @@ ${instructions}`;
               const data = JSON.parse(line);
               const createdAt = data.createdAt ?? 0;
               if (createdAt > sinceMs) {
-                sessionCount++;
+                if (typeof data.composerId === "string")
+                  activeComposerIds.add(data.composerId);
+                else
+                  newComposersWithoutId++;
+                activeDays.add(new Date(createdAt).toISOString().slice(0, 10));
                 totalLinesAdded += data.totalLinesAdded ?? 0;
                 totalLinesRemoved += data.totalLinesRemoved ?? 0;
                 if (data.unifiedMode === "agent" || data.isAgentic)
@@ -13452,7 +13438,34 @@ ${instructions}`;
             }
           }
         }
+        const bubbleResult = queryReadonlySqlite(globalDbPath, `SELECT json_object('k', key, 'type', json_extract(value,'$.type'), 'ts', json_extract(value,'$.createdAt'), 'tool', json_extract(value,'$.toolFormerData.name')) FROM cursorDiskKV WHERE key LIKE 'bubbleId:%'`);
+        if (bubbleResult) {
+          for (const line of bubbleResult.split(`
+`)) {
+            if (!line.trim())
+              continue;
+            try {
+              const b = JSON.parse(line);
+              const ts = typeof b.ts === "string" ? Date.parse(b.ts) : NaN;
+              if (!Number.isFinite(ts) || ts <= sinceMs)
+                continue;
+              if (ts > latestActivity)
+                latestActivity = ts;
+              activeDays.add(new Date(ts).toISOString().slice(0, 10));
+              const parts = (b.k ?? "").split(":");
+              if (parts.length >= 3)
+                activeComposerIds.add(parts[1]);
+              if (b.tool)
+                toolCallCount++;
+              else if (b.type === 1 || b.type === 2)
+                messageCount++;
+            } catch {
+              continue;
+            }
+          }
+        }
       }
+      const sessionCount = newComposersWithoutId + activeComposerIds.size;
       const trackingDbPath = join24(homedir7(), ".cursor", "ai-tracking", "ai-code-tracking.db");
       let aiCommitCount = 0;
       let avgAiPercent = 0;
@@ -13465,17 +13478,19 @@ ${instructions}`;
           avgAiPercent = parseFloat(parts[1]) || 0;
         }
       }
-      if (sessionCount === 0 && latestActivity <= sinceMs)
+      const hasNewActivity = sessionCount > 0 || messageCount > 0;
+      if (!hasNewActivity && latestActivity <= sinceMs)
         return null;
       return {
-        hasNewActivity: sessionCount > 0,
+        hasNewActivity,
         sessionCount,
-        messageCount: 0,
-        toolCallCount: 0,
+        messageCount,
+        toolCallCount,
         tokensUsed: 0,
         aiLinesAdded: totalLinesAdded,
         aiLinesRemoved: totalLinesRemoved,
         lastActiveAt: latestActivity > 0 ? new Date(latestActivity).toISOString() : null,
+        activeDays: activeDays.size > 0 ? [...activeDays].sort() : undefined,
         extra: {
           agenticSessions,
           chatSessions,
@@ -13710,6 +13725,8 @@ var AGENT_REGISTRY = [
     },
     manualSetup: {
       title: "Install Runwork plugin",
+      action: "Install Runwork plugin",
+      preposition: "for",
       showAfter: "connecting",
       downloadArtifact: {
         label: "Download plugin",
@@ -13717,7 +13734,7 @@ var AGENT_REGISTRY = [
         command: "build-plugin"
       },
       steps: [
-        { id: "download", label: "Click Download plugin above to save runwork-plugin.zip" },
+        { id: "download", label: "Download the plugin. It saves runwork-plugin.zip to your Downloads folder.", control: "download-artifact" },
         { id: "open", label: "Open Claude Desktop and sign in if you haven't already" },
         { id: "cowork", label: "Go to the Cowork tab (top of the window)" },
         { id: "customize", label: "Click Customize in the sidebar" },
@@ -13891,6 +13908,8 @@ var AGENT_REGISTRY = [
     },
     manualSetup: {
       title: "Connect Runwork in ChatGPT",
+      action: "Create Runwork connector",
+      preposition: "in",
       showAfter: "connecting",
       copyValue: { label: "Workspace MCP URL", token: "{mcpUrl}" },
       steps: [
@@ -13898,7 +13917,7 @@ var AGENT_REGISTRY = [
         { id: "settings-apps", label: "Open the profile menu (bottom-left), then Settings, then Apps" },
         { id: "dev-mode", label: 'Click "Advanced settings" and turn on "Developer mode" (skip if it is already on)' },
         { id: "create-app", label: 'Go back to Apps and click "Create app"' },
-        { id: "fill", label: 'In the New App dialog, set Name to "Runwork", keep Connection on "Server URL", and paste the Workspace MCP URL above into the Server URL field' },
+        { id: "fill", label: 'In the New App dialog, set Name to "Runwork", keep Connection on "Server URL", then paste this Workspace MCP URL into the Server URL field:', control: "copy-value" },
         { id: "oauth", label: 'Leave Authentication set to "OAuth", check "I understand and want to continue", then click Create' },
         { id: "authorize", label: "Complete the OAuth sign-in to authorize Runwork for your account" },
         { id: "confirm", label: 'In a new chat, ask "Do you have access to Runwork tools?" to confirm (or check Settings, then Apps, for Runwork)' }
@@ -13908,6 +13927,8 @@ var AGENT_REGISTRY = [
           key: "team",
           label: "Team / Enterprise",
           title: "Connect the Runwork app in ChatGPT",
+          action: "Connect the Runwork app",
+          preposition: "in",
           steps: [
             { id: "open", label: "Open chatgpt.com and sign in" },
             { id: "settings-apps", label: "Open the profile menu (bottom-left), then Settings, then Apps" },
@@ -13920,12 +13941,14 @@ var AGENT_REGISTRY = [
           key: "personal",
           label: "Personal",
           title: "Create the Runwork connector in ChatGPT",
+          action: "Create Runwork connector",
+          preposition: "in",
           steps: [
             { id: "open", label: "Open chatgpt.com and sign in" },
             { id: "settings-apps", label: "Open the profile menu (bottom-left), then Settings, then Apps" },
             { id: "dev-mode", label: 'Click "Advanced settings" and turn on "Developer mode" (skip if it is already on)' },
             { id: "create-app", label: 'Go back to Apps and click "Create app"' },
-            { id: "fill", label: 'In the New App dialog, set Name to "Runwork", keep Connection on "Server URL", and paste the Workspace MCP URL above into the Server URL field' },
+            { id: "fill", label: 'In the New App dialog, set Name to "Runwork", keep Connection on "Server URL", then paste this Workspace MCP URL into the Server URL field:', control: "copy-value" },
             { id: "oauth", label: 'Leave Authentication set to "OAuth", check "I understand and want to continue", then click Create' },
             { id: "authorize", label: "Complete the OAuth sign-in to authorize Runwork for your account" },
             { id: "confirm", label: 'In a new chat, ask "Do you have access to Runwork tools?" to confirm (or check Settings, then Apps, for Runwork)' }
@@ -13965,6 +13988,8 @@ var AGENT_REGISTRY = [
     },
     manualSetup: {
       title: "Connect Runwork in ChatGPT",
+      action: "Create Runwork connector",
+      preposition: "in",
       showAfter: "connecting",
       copyValue: { label: "Workspace MCP URL", token: "{mcpUrl}" },
       steps: [
@@ -13973,7 +13998,7 @@ var AGENT_REGISTRY = [
         { id: "settings-apps", label: "Open the profile menu (bottom-left), then Settings, then Apps" },
         { id: "dev-mode", label: 'Click "Advanced settings" and turn on "Developer mode" (skip if it is already on)' },
         { id: "create-app", label: 'Go back to Apps and click "Create app"' },
-        { id: "fill", label: 'In the New App dialog, set Name to "Runwork", keep Connection on "Server URL", and paste the Workspace MCP URL above into the Server URL field' },
+        { id: "fill", label: 'In the New App dialog, set Name to "Runwork", keep Connection on "Server URL", then paste this Workspace MCP URL into the Server URL field:', control: "copy-value" },
         { id: "oauth", label: 'Leave Authentication set to "OAuth", check "I understand and want to continue", then click Create' },
         { id: "authorize", label: "Complete the OAuth sign-in to authorize Runwork for your account" },
         { id: "confirm", label: 'Open the ChatGPT desktop app and, in a new chat, ask "Do you have access to Runwork tools?" to confirm' }
@@ -13983,6 +14008,8 @@ var AGENT_REGISTRY = [
           key: "team",
           label: "Team / Enterprise",
           title: "Connect the Runwork app in ChatGPT",
+          action: "Connect the Runwork app",
+          preposition: "in",
           steps: [
             { id: "install", label: "Install the ChatGPT desktop app from chatgpt.com/download if you have not already" },
             { id: "open", label: "Open the ChatGPT desktop app and sign in" },
@@ -13996,13 +14023,15 @@ var AGENT_REGISTRY = [
           key: "personal",
           label: "Personal",
           title: "Create the Runwork connector in ChatGPT",
+          action: "Create Runwork connector",
+          preposition: "in",
           steps: [
             { id: "install", label: "Install the ChatGPT desktop app from chatgpt.com/download if you have not already" },
             { id: "open-web", label: "Connectors are created on chatgpt.com: open it in your browser and sign in" },
             { id: "settings-apps", label: "Open the profile menu (bottom-left), then Settings, then Apps" },
             { id: "dev-mode", label: 'Click "Advanced settings" and turn on "Developer mode" (skip if it is already on)' },
             { id: "create-app", label: 'Go back to Apps and click "Create app"' },
-            { id: "fill", label: 'In the New App dialog, set Name to "Runwork", keep Connection on "Server URL", and paste the Workspace MCP URL above into the Server URL field' },
+            { id: "fill", label: 'In the New App dialog, set Name to "Runwork", keep Connection on "Server URL", then paste this Workspace MCP URL into the Server URL field:', control: "copy-value" },
             { id: "oauth", label: 'Leave Authentication set to "OAuth", check "I understand and want to continue", then click Create' },
             { id: "authorize", label: "Complete the OAuth sign-in to authorize Runwork for your account" },
             { id: "confirm", label: 'Open the ChatGPT desktop app and, in a new chat, ask "Do you have access to Runwork tools?" to confirm' }
@@ -14492,50 +14521,162 @@ class CodexAdapter {
         return null;
       const sinceMs = lastSyncAt ? new Date(lastSyncAt).getTime() : 0;
       const sinceSec = Math.floor(sinceMs / 1000);
+      const rollout = this.scanRolloutActivity(sinceMs);
+      let sessionCount = rollout.sessionCount;
+      let tokensUsed = rollout.tokensUsed;
+      let latestMs = rollout.latestMs;
+      let versions = [];
       const dbPath = join28(codexDir, "state_5.sqlite");
-      if (!existsSync33(dbPath))
-        return null;
-      const countResult = queryReadonlySqlite(dbPath, `SELECT count(*) FROM threads WHERE updated_at > ${sinceSec}`);
-      const sessionCount = parseInt(countResult) || 0;
-      const tokensResult = queryReadonlySqlite(dbPath, `SELECT coalesce(sum(tokens_used), 0) FROM threads WHERE updated_at > ${sinceSec}`);
-      const tokensUsed = parseInt(tokensResult) || 0;
-      const latestResult = queryReadonlySqlite(dbPath, `SELECT max(updated_at) FROM threads`);
-      const latestSec = parseInt(latestResult) || 0;
-      const versionsResult = queryReadonlySqlite(dbPath, `SELECT DISTINCT cli_version FROM threads WHERE cli_version IS NOT NULL ORDER BY created_at DESC LIMIT 3`);
-      const versions = versionsResult ? versionsResult.split(/[\r\n]+/).filter(Boolean) : [];
-      let messageCount = 0;
-      const historyPath = join28(codexDir, "history.jsonl");
-      if (existsSync33(historyPath)) {
-        const content = readFileSync26(historyPath, "utf-8").trim();
-        if (content) {
-          for (const line of content.split(/[\r\n]+/)) {
-            try {
-              const entry = JSON.parse(line);
-              if (entry.ts && entry.ts > sinceSec)
-                messageCount++;
-            } catch {
-              continue;
+      if (existsSync33(dbPath)) {
+        const countResult = queryReadonlySqlite(dbPath, `SELECT count(*) FROM threads WHERE updated_at > ${sinceSec}`);
+        const dbSessionCount = parseInt(countResult) || 0;
+        const tokensResult = queryReadonlySqlite(dbPath, `SELECT coalesce(sum(tokens_used), 0) FROM threads WHERE updated_at > ${sinceSec}`);
+        const dbTokens = parseInt(tokensResult) || 0;
+        const latestResult = queryReadonlySqlite(dbPath, `SELECT max(updated_at) FROM threads`);
+        const latestSec = parseInt(latestResult) || 0;
+        const versionsResult = queryReadonlySqlite(dbPath, `SELECT DISTINCT cli_version FROM threads WHERE cli_version IS NOT NULL ORDER BY created_at DESC LIMIT 3`);
+        versions = versionsResult ? versionsResult.split(/[\r\n]+/).filter(Boolean) : [];
+        sessionCount = Math.max(dbSessionCount, rollout.sessionCount);
+        if (dbTokens > 0)
+          tokensUsed = dbTokens;
+        if (latestSec * 1000 > latestMs)
+          latestMs = latestSec * 1000;
+      }
+      let messageCount = rollout.messageCount;
+      if (messageCount === 0) {
+        const historyPath = join28(codexDir, "history.jsonl");
+        if (existsSync33(historyPath)) {
+          const content = readFileSync26(historyPath, "utf-8").trim();
+          if (content) {
+            for (const line of content.split(/[\r\n]+/)) {
+              try {
+                const entry = JSON.parse(line);
+                if (entry.ts && entry.ts > sinceSec)
+                  messageCount++;
+              } catch {
+                continue;
+              }
             }
           }
         }
       }
-      if (sessionCount === 0 && latestSec * 1000 <= sinceMs)
+      const hasNewActivity = sessionCount > 0 || messageCount > 0;
+      if (!hasNewActivity && latestMs <= sinceMs)
         return null;
       return {
-        hasNewActivity: sessionCount > 0,
+        hasNewActivity,
         sessionCount,
         messageCount,
-        toolCallCount: 0,
+        toolCallCount: rollout.toolCallCount,
         tokensUsed,
         aiLinesAdded: 0,
         aiLinesRemoved: 0,
-        lastActiveAt: latestSec > 0 ? new Date(latestSec * 1000).toISOString() : null,
+        lastActiveAt: latestMs > 0 ? new Date(latestMs).toISOString() : null,
+        activeDays: rollout.activeDays.length > 0 ? rollout.activeDays : undefined,
         extra: versions.length > 0 ? { cliVersions: versions } : undefined
       };
     } catch {
       return null;
     }
   }
+  scanRolloutActivity(sinceMs) {
+    const days = new Set;
+    const result = {
+      sessionCount: 0,
+      messageCount: 0,
+      toolCallCount: 0,
+      tokensUsed: 0,
+      latestMs: 0,
+      activeDays: []
+    };
+    const sessionsDir = join28(homedir11(), ".codex", "sessions");
+    if (!existsSync33(sessionsDir))
+      return result;
+    const files = [];
+    const walk = (dir) => {
+      let entries;
+      try {
+        entries = readdirSync9(dir, { withFileTypes: true });
+      } catch {
+        return;
+      }
+      for (const e of entries) {
+        const full = join28(dir, e.name);
+        if (e.isDirectory())
+          walk(full);
+        else if (e.name.startsWith("rollout-") && e.name.endsWith(".jsonl"))
+          files.push(full);
+      }
+    };
+    walk(sessionsDir);
+    for (const file of files) {
+      let stat;
+      try {
+        stat = statSync5(file);
+      } catch {
+        continue;
+      }
+      if (stat.mtimeMs <= sinceMs)
+        continue;
+      let content;
+      try {
+        content = readFileSync26(file, "utf-8");
+      } catch {
+        continue;
+      }
+      let fileHadActivity = false;
+      let fileTokens = 0;
+      for (const line of content.split(`
+`)) {
+        if (!line.trim())
+          continue;
+        let o;
+        try {
+          o = JSON.parse(line);
+        } catch {
+          continue;
+        }
+        const ts = typeof o.timestamp === "string" ? Date.parse(o.timestamp) : NaN;
+        if (!Number.isFinite(ts) || ts <= sinceMs)
+          continue;
+        const p = o.payload;
+        if (!p || typeof p !== "object")
+          continue;
+        const pt = p.type;
+        if (o.type === "event_msg") {
+          if (pt === "user_message" || pt === "agent_message") {
+            result.messageCount++;
+            fileHadActivity = true;
+            if (ts > result.latestMs)
+              result.latestMs = ts;
+            days.add(new Date(ts).toISOString().slice(0, 10));
+          } else if (pt === "token_count") {
+            const info = p.info;
+            const usage = info?.total_token_usage;
+            if (usage) {
+              const total = (usage.input_tokens ?? 0) + (usage.output_tokens ?? 0);
+              if (total > fileTokens)
+                fileTokens = total;
+            }
+            if (ts > result.latestMs)
+              result.latestMs = ts;
+          }
+        } else if (o.type === "response_item" && (pt === "function_call" || pt === "tool_search_call")) {
+          result.toolCallCount++;
+          fileHadActivity = true;
+          if (ts > result.latestMs)
+            result.latestMs = ts;
+          days.add(new Date(ts).toISOString().slice(0, 10));
+        }
+      }
+      if (fileHadActivity) {
+        result.sessionCount++;
+        result.tokensUsed += fileTokens;
+      }
+    }
+    result.activeDays = [...days].sort();
+    return result;
+  }
   async readSessionDigests(sinceISO) {
     try {
       const sessionsDir = join28(homedir11(), ".codex", "sessions");
@@ -14653,9 +14794,10 @@ class CodexAdapter {
     } catch {
       return;
     }
+    const seenInFile = new Set;
     for (const line of content.split(`
 `)) {
-      if (!line)
+      if (!line || !line.includes("SKILL.md"))
         continue;
       let entry;
       try {
@@ -14663,35 +14805,37 @@ class CodexAdapter {
       } catch {
         continue;
       }
-      if (entry.type !== "session_meta")
+      if (entry.type !== "response_item")
         continue;
       const payload = entry.payload;
       if (!payload)
         continue;
+      const pt = payload.type;
+      if (pt !== "function_call" && pt !== "custom_tool_call")
+        continue;
       const tsRaw = entry.timestamp;
       const ts = typeof tsRaw === "string" ? Date.parse(tsRaw) : 0;
-      if (ts <= sinceMs)
+      if (!Number.isFinite(ts) || ts <= sinceMs)
         continue;
-      const instructions = payload.instructions;
-      if (typeof instructions !== "string")
+      const args = typeof payload.arguments === "string" ? payload.arguments : JSON.stringify(payload.arguments ?? "");
+      const m = args.match(/([^\s"']*\/skills\/[^\s"']*\/)SKILL\.md/);
+      if (!m)
         continue;
-      const skillRegex = /^- ([^:]+):\s+.+\(file:\s+(.+\/SKILL\.md)\)/gm;
-      let match;
-      while ((match = skillRegex.exec(instructions)) !== null) {
-        const skillName = match[1].trim();
-        const skillPath = match[2];
-        if (skillPath.includes("/.system/"))
-          continue;
-        const existing = skillCounts.get(skillName);
-        if (existing) {
-          existing.count++;
-          if (ts > existing.lastTs)
-            existing.lastTs = ts;
-        } else {
-          skillCounts.set(skillName, { count: 1, lastTs: ts });
-        }
+      const skillDir = m[1];
+      if (skillDir.includes("/plugins/cache/openai-") || skillDir.includes("/.system/"))
+        continue;
+      const skillName = skillNameFromPath(skillDir);
+      if (!skillName || seenInFile.has(skillName))
+        continue;
+      seenInFile.add(skillName);
+      const existing = skillCounts.get(skillName);
+      if (existing) {
+        existing.count++;
+        if (ts > existing.lastTs)
+          existing.lastTs = ts;
+      } else {
+        skillCounts.set(skillName, { count: 1, lastTs: ts });
       }
-      break;
     }
   }
   registerDesktopWorkspace(workspacePath, label) {
@@ -14865,7 +15009,7 @@ class ClineAdapter {
 }
 
 // src/agents/gemini.ts
-import { existsSync as existsSync35, mkdirSync as mkdirSync22, readdirSync as readdirSync11, readFileSync as readFileSync28, rmSync as rmSync10, writeFileSync as writeFileSync23 } from "fs";
+import { existsSync as existsSync35, mkdirSync as mkdirSync22, readdirSync as readdirSync11, readFileSync as readFileSync28, rmSync as rmSync10, statSync as statSync6, writeFileSync as writeFileSync23 } from "fs";
 import { join as join30 } from "path";
 import { homedir as homedir13 } from "os";
 class GeminiAdapter {
@@ -14943,6 +15087,86 @@ class GeminiAdapter {
     mkdirSync22(join30(settingsPath, ".."), { recursive: true });
     writeFileSync23(settingsPath, JSON.stringify(settings, null, 2));
   }
+  async readUsageStats(lastSyncAt) {
+    try {
+      const tmpDir = join30(homedir13(), ".gemini", "tmp");
+      if (!existsSync35(tmpDir))
+        return null;
+      const sinceMs = lastSyncAt ? new Date(lastSyncAt).getTime() : 0;
+      let sessionCount = 0;
+      let messageCount = 0;
+      let latestMs = 0;
+      const activeDays = new Set;
+      let projects;
+      try {
+        projects = readdirSync11(tmpDir, { withFileTypes: true });
+      } catch {
+        return null;
+      }
+      for (const project of projects) {
+        if (!project.isDirectory())
+          continue;
+        const chatsDir = join30(tmpDir, project.name, "chats");
+        let files;
+        try {
+          files = readdirSync11(chatsDir, { withFileTypes: true });
+        } catch {
+          continue;
+        }
+        for (const file of files) {
+          if (!file.name.startsWith("session-") || !file.name.endsWith(".json"))
+            continue;
+          const filePath = join30(chatsDir, file.name);
+          let stat;
+          try {
+            stat = statSync6(filePath);
+          } catch {
+            continue;
+          }
+          if (stat.mtimeMs <= sinceMs)
+            continue;
+          let session;
+          try {
+            session = JSON.parse(readFileSync28(filePath, "utf-8"));
+          } catch {
+            continue;
+          }
+          if (!Array.isArray(session.messages))
+            continue;
+          let sessionHadActivity = false;
+          for (const m of session.messages) {
+            const ts = typeof m.timestamp === "string" ? Date.parse(m.timestamp) : NaN;
+            if (!Number.isFinite(ts) || ts <= sinceMs)
+              continue;
+            if (m.type === "user" || m.type === "gemini") {
+              messageCount++;
+              sessionHadActivity = true;
+              if (ts > latestMs)
+                latestMs = ts;
+              activeDays.add(new Date(ts).toISOString().slice(0, 10));
+            }
+          }
+          if (sessionHadActivity)
+            sessionCount++;
+        }
+      }
+      if (sessionCount === 0)
+        return null;
+      return {
+        hasNewActivity: true,
+        sessionCount,
+        messageCount,
+        toolCallCount: 0,
+        tokensUsed: 0,
+        aiLinesAdded: 0,
+        aiLinesRemoved: 0,
+        lastActiveAt: latestMs > 0 ? new Date(latestMs).toISOString() : null,
+        activeDays: [...activeDays].sort()
+      };
+    } catch {
+      return null;
+    }
+  }
   async cleanup(scope, manifest) {
     if (scope === "user") {
       removeRunworkMcpServers(join30(homedir13(), ".gemini", "settings.json"), "mcpServers");
@@ -17119,6 +17343,12 @@ var RUNWORK_AGENT_DEFAULTS = {
 var AGENT_DEFAULTS_SCHEMA_VERSION = 1;
 
 // src/commands/sync-telemetry.ts
+var TELEMETRY_BACKFILL_MS = 30 * 24 * 60 * 60 * 1000;
+function resolveTelemetrySince(state, nowMs = Date.now()) {
+  if (state.lastTelemetryAt)
+    return state.lastTelemetryAt;
+  return new Date(nowMs - TELEMETRY_BACKFILL_MS).toISOString();
+}
 async function collectTelemetryEvents(params) {
   const now = params.now ?? new Date().toISOString();
   const events = [];
@@ -17129,7 +17359,7 @@ async function collectTelemetryEvents(params) {
     let error;
     if (adapter2.readUsageStats) {
       try {
-        stats = await adapter2.readUsageStats(params.state.lastSyncAt ?? null);
+        stats = await adapter2.readUsageStats(params.since);
         if (stats && stats.hasNewActivity) {
           events.push({
             eventType: "local_agent.usage",
@@ -17142,6 +17372,7 @@ async function collectTelemetryEvents(params) {
               aiLinesAdded: stats.aiLinesAdded,
               aiLinesRemoved: stats.aiLinesRemoved,
               lastActiveAt: stats.lastActiveAt,
+              activeDays: stats.activeDays,
               modelsUsed: stats.modelsUsed,
               mcpToolCount: stats.mcpToolCount,
               ...stats.extra
@@ -17156,7 +17387,7 @@ async function collectTelemetryEvents(params) {
     }
     if (adapter2.readSkillUsage) {
       try {
-        skills = await adapter2.readSkillUsage(params.state.lastSyncAt ?? null);
+        skills = await adapter2.readSkillUsage(params.since);
         if (skills && skills.length > 0) {
           for (const entry of skills) {
             events.push({
@@ -18481,6 +18712,7 @@ async function syncFromState(state, statePath2, credentials, opts) {
       const telemetry = await collectTelemetryEvents({
         adapters,
         state,
+        since: resolveTelemetrySince(state),
         syncedSkillsCount: remoteSkills.length,
         syncedMcpServersCount: mcpEntries.length,
         teamInstructionsApplied: false,
@@ -18860,21 +19092,25 @@ async function syncFromState(state, statePath2, credentials, opts) {
   state.skillHashes = mergedHashes;
   writeFileSync29(statePath2, JSON.stringify(state, null, 2));
   try {
+    const telemetryNow = new Date().toISOString();
     const telemetry = await collectTelemetryEvents({
       adapters,
       state,
+      since: resolveTelemetrySince(state, Date.parse(telemetryNow)),
       syncedSkillsCount: remoteSkills.length,
       syncedMcpServersCount: mcpEntries.length,
       teamInstructionsApplied,
-      agentConfigsApplied
+      agentConfigsApplied,
+      now: telemetryNow
     });
     if (opts.verbose)
       printTelemetryVerbose(telemetry);
     await client.reportTelemetry(state.workspaceId, telemetry.events);
+    state.lastTelemetryAt = telemetryNow;
     if (telemetry.healthReported) {
       state.lastHealthReportAt = new Date().toISOString();
-      writeFileSync29(statePath2, JSON.stringify(state, null, 2));
     }
+    writeFileSync29(statePath2, JSON.stringify(state, null, 2));
   } catch {}
   const failedNote = summary.adaptersFailed > 0 ? ` (${summary.adaptersFailed} failed)` : "";
   if (isVerbose()) {
@@ -20261,7 +20497,7 @@ async function applyDoctorFixes(ctx, failingNames) {
 }
 
 // src/agents/runtime-detection.ts
-import { existsSync as existsSync46, readFileSync as readFileSync39, statSync as statSync6, readdirSync as readdirSync13 } from "fs";
+import { existsSync as existsSync46, readFileSync as readFileSync39, statSync as statSync7, readdirSync as readdirSync13 } from "fs";
 import { homedir as homedir23 } from "os";
 import { join as join42 } from "path";
 var RUNWORK_SESSIONS_DIR = join42(homedir23(), ".runwork", "sessions");
@@ -20372,7 +20608,7 @@ function findCodexRolloutFile(threadId) {
       const full = join42(dir, entry);
       let s;
       try {
-        s = statSync6(full);
+        s = statSync7(full);
       } catch {
         continue;
       }
@@ -20409,7 +20645,7 @@ function findNewestClaudeCodeSession() {
         continue;
       const full = join42(projectPath, file);
       try {
-        const s = statSync6(full);
+        const s = statSync7(full);
         if (!best || s.mtimeMs > best.mtime) {
           best = {
             sessionId: file.replace(/\.jsonl$/, ""),
@@ -20442,7 +20678,7 @@ function findNewestCodexRollout() {
       const full = join42(dir, entry);
       let s;
       try {
-        s = statSync6(full);
+        s = statSync7(full);
       } catch {
         continue;
       }

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "runwork",
-  "version": "0.17.1",
+  "version": "0.18.0",
   "description": "CLI for Runwork: develop, preview, and deploy Runwork apps from your local machine.",
   "license": "UNLICENSED",
-  "author": "Runwork <info@runwork.ai> (https://www.runwork.ai)",
+  "author": "Runwork, Inc. <info@runwork.ai> (https://www.runwork.ai)",
   "homepage": "https://www.runwork.ai",
   "keywords": [
     "runwork",