@blastin-dev/clocktopus-cli 0.2.0 → 0.2.1

package/README.md

@@ -67,34 +67,77 @@ Show clock signals for a given date.
 ### `clocktopus agent setup`
 
 ```
-clocktopus agent setup [--name <label>] [--force]
+clocktopus agent setup [--name <label>] [--force] [--agent <ids>]
 ```
 
 Configures this machine to report AI agent spend — token cost, active time,
 and the repository each session worked in — so the true cost of a piece of
 work can be measured as human time × rate **plus** agent spend.
 
-It mints an ingest token, writes the exporter configuration and installs the
-`SessionStart` / `SessionEnd` hooks into `~/.claude/settings.json`, then
-confirms the receiver accepts the token before reporting success.
+One command, however many agents you have. It looks for each supported CLI
+on PATH and configures what it finds:
+
+```
+Agents on this machine
+
+  1  Claude Code   2.1.234   already configured
+  2  Codex CLI     0.147.0   not configured
+
+Which should report to Clocktopus? [all]:
+```
+
+With one agent installed there is no question to ask, so it just runs. With
+several it prompts; `--agent` skips the prompt, and a non-interactive shell
+configures everything found and says so.
+
+| Agent       | `--agent` id | Writes                                        |
+| ----------- | ------------ | --------------------------------------------- |
+| Claude Code | `claude`     | `~/.claude/settings.json`                     |
+| Codex CLI   | `codex`      | `~/.codex/config.toml`, `~/.codex/hooks.json` |
+| OpenCode    | `opencode`   | `~/.config/opencode/plugin/clocktopus.js`     |
+
+It mints **one** ingest token for the machine, writes each agent's exporter
+configuration and `SessionStart` / `SessionEnd` hooks, then confirms the
+receiver accepts the token before reporting success.
 
 | Option           | Description                                                                                                     |
 | ---------------- | --------------------------------------------------------------------------------------------------------------- |
 | `--name <label>` | Label for this machine's token. Defaults to the hostname — keep it recognisable, since revocation is per token. |
 | `--force`        | Mint a replacement token instead of reusing the one already installed.                                          |
+| `-a, --agent`    | Configure only these agents. Repeatable, or comma-separated: `--agent claude,codex`.                            |
 
 Re-running without `--force` is safe and idempotent: it repairs the hooks and
-refreshes the endpoint while keeping the existing token.
-
-**Restart Claude Code afterwards.** Both the OTLP exporter and the hook read
-their configuration once, at process start, so a session that is already open
-will not pick any of it up. This is the most common reason a correct setup
-appears to do nothing.
-
-Everything lands in `~/.claude/settings.json` — the exporter environment and
-the hooks in one file. That single source of truth is what lets
-`agent doctor` say which value is actually in force. Note the ingest token is
-stored there in plaintext: if you keep `~/.claude` in a dotfiles repository,
+refreshes the endpoint while keeping the existing token. Installing a second
+agent later and re-running costs nothing — the new one inherits the token the
+first is already using rather than minting a second against the same machine.
+
+**Restart the agent afterwards.** Every exporter and hook reads its
+configuration once, at process start, so a session that is already open will
+not pick any of it up. This is the most common reason a correct setup appears
+to do nothing.
+
+**OpenCode is a plugin, not a hook.** It has no hook system, so setup
+writes one generated file into `~/.config/opencode/plugin/`, which OpenCode
+auto-loads. Your `opencode.json` is not touched — that file is your model,
+provider and permission configuration, and leaving it alone removes a whole
+class of ways to break your setup. Uninstalling is deleting the file.
+
+OpenCode also has `experimental.openTelemetry`, which looks like an easier
+route and is not one: its spans carry your prompts and the model's replies
+verbatim, with no way to switch that off, and no cost or repository. The
+plugin reads OpenCode's own per-message totals instead and sends counts and
+identifiers only.
+
+**Codex needs one extra step, once.** It will not run a `hooks.json` it has
+not been shown, so the next Codex session asks — answer _Trust all and
+continue_. Until you do, Codex reports what your sessions cost but not which
+repository they were spent on. `clocktopus agent doctor` reports the state
+until it is approved.
+
+Everything for an agent lands in that agent's own config rather than a shell
+profile. That single source of truth per agent is what lets `agent doctor`
+say which value is actually in force. Note the ingest token is stored there
+in plaintext: if you keep `~/.claude` or `~/.codex` in a dotfiles repository,
 ignore the file.
 
 Setup then checks the repository you ran it in, because configuring the
@@ -124,21 +167,27 @@ claim; this is the evidence.
 
 The two ingest lanes are reported separately because they fail separately:
 
-| Lane    | Carries                          | If it alone goes quiet                                   |
-| ------- | -------------------------------- | -------------------------------------------------------- |
-| Hook    | repository, branch, commit range | spend is recorded but cannot be attributed to a project  |
-| Metrics | tokens, cost, active time        | sessions show `$0.00`, indistinguishable from cheap work |
+| Lane  | Carries                          | If it alone goes quiet                                   |
+| ----- | -------------------------------- | -------------------------------------------------------- |
+| Hook  | repository, branch, commit range | spend is recorded but cannot be attributed to a project  |
+| Spend | tokens, cost, active time        | sessions show `$0.00`, indistinguishable from cheap work |
+
+It also lists every supported agent found on this machine, including any
+that are installed but _not_ reporting — a state the server-side lanes
+cannot show, because those sessions simply never arrive.
 
 That second failure is why there is no single "connected" line — it is the
 one that silently understates what work cost.
 
 ### `clocktopus agent doctor`
 
-Checks every link in the chain and names the first one that is broken:
-settings file parses, exporter variables present, both hooks installed, the
-hook command actually executes, the receiver accepts the token, the
-repository is attached to a project and delivering commits, no other file is
-shadowing the configuration, and whether Claude Code needs restarting.
+Checks every link in the chain, per agent, and names the first one that is
+broken: the config file parses, the exporter is configured, both hooks are
+installed, the hook command actually executes, Codex has approved its hooks,
+the receiver accepts the token, no other file is shadowing the
+configuration, and whether that agent needs restarting. The repository
+checks — attached to a project, delivering commits — run once at the end,
+since they are facts about the repo rather than about any one agent.
 
 The receiver check is the one that cannot be done locally — it crosses the
 network to a different host than the dashboard, so a wrong endpoint and a
@@ -147,15 +196,21 @@ revoked token are otherwise indistinguishable from an idle afternoon.
 ### `clocktopus agent disable`
 
 ```
-clocktopus agent disable [--revoke]
+clocktopus agent disable [--revoke] [--agent <ids>]
 ```
 
-Removes this machine's telemetry configuration, leaving any hooks and
-environment variables you added yourself untouched.
+Removes this machine's telemetry configuration from every agent, leaving any
+hooks and settings you added yourself untouched.
+
+| Option        | Description                                                                 |
+| ------------- | --------------------------------------------------------------------------- |
+| `--revoke`    | Also revoke the ingest token, making it useless everywhere.                 |
+| `-a, --agent` | Remove only these agents (`claude`, `codex`), leaving the others reporting. |
 
-| Option     | Description                                                 |
-| ---------- | ----------------------------------------------------------- |
-| `--revoke` | Also revoke the ingest token, making it useless everywhere. |
+`--revoke` is ignored when combined with `--agent`: the token is shared by
+every agent on the machine, so killing it while another one still has it
+written would leave that agent posting into a 401 forever — which looks
+like an idle week rather than a broken install.
 
 Stopping and revoking are separate on purpose: removing the local
 configuration stops _this_ machine reporting, but does nothing about a token
@@ -173,7 +228,7 @@ ig.json`
 Run `clocktopus logout` to clear stored credentials.
 
 The agent telemetry setup deliberately keeps **no** copy of the ingest token
-here. It has to live in `~/.claude/settings.json` for Claude Code's exporter
-to read it, and a second copy would be another thing to leak and another
-thing to fall out of date. Only the token id (needed to revoke) and its
-display prefix are kept.
+here. It has to live in each agent's own config for that agent's exporter to
+read it, and a second copy would be another thing to leak and another thing
+to fall out of date. Only the token id (needed to revoke) and its display
+prefix are kept.

package/dist/src/commands/agent/disable.d.ts

@@ -1,5 +1,5 @@
 /**
- * Removes this machine's telemetry configuration.
+ * Removes this machine's telemetry configuration, from every agent.
  *
  * Stopping and revoking are separate on purpose. Removing the local
  * configuration stops *this* machine reporting; it does nothing about a
@@ -7,8 +7,15 @@
  * repository. `--revoke` is the one that makes the token useless everywhere,
  * and it is opt-in because the common case — moving machines, reinstalling —
  * should not invalidate a token that CI or another workstation still uses.
+ *
+ * `--agent` narrows it to one, which is the only way to stop reporting from
+ * Codex while leaving Claude Code alone. Without it every agent is cleaned,
+ * including ones no longer installed — an uninstalled agent's config file
+ * outlives it, and a token left in a file nobody looks at is the worst
+ * place for one to sit.
  */
 export declare function disableCommand(options: {
     revoke?: boolean;
+    agent?: string[];
 }): Promise<void>;
 //# sourceMappingURL=disable.d.ts.map

package/dist/src/commands/agent/disable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"disable.d.ts","sourceRoot":"","sources":["../../../../src/commands/agent/disable.ts"],"names":[],"mappings":"AAcA;;;;;;;;;GASG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE;IAC5C,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+EhB"}
+{"version":3,"file":"disable.d.ts","sourceRoot":"","sources":["../../../../src/commands/agent/disable.ts"],"names":[],"mappings":"AASA;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE;IAC5C,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyFhB"}

package/dist/src/commands/agent/disable.js

@@ -1,9 +1,9 @@
 import { clearHookState } from "../../lib/agent-hook-state.js";
+import { isConfigParseError, surveyAgents } from "../../lib/agents.js";
 import { ApiError, request } from "../../lib/api.js";
-import { readSettings, removeTelemetrySettings, SettingsParseError, writeSettings, } from "../../lib/claude-settings.js";
 import { clearAgentConfig, getAgentConfig, isLoggedIn, } from "../../lib/config.js";
 /**
- * Removes this machine's telemetry configuration.
+ * Removes this machine's telemetry configuration, from every agent.
  *
  * Stopping and revoking are separate on purpose. Removing the local
  * configuration stops *this* machine reporting; it does nothing about a
@@ -11,62 +11,96 @@ import { clearAgentConfig, getAgentConfig, isLoggedIn, } from "../../lib/config.
  * repository. `--revoke` is the one that makes the token useless everywhere,
  * and it is opt-in because the common case — moving machines, reinstalling —
  * should not invalidate a token that CI or another workstation still uses.
+ *
+ * `--agent` narrows it to one, which is the only way to stop reporting from
+ * Codex while leaving Claude Code alone. Without it every agent is cleaned,
+ * including ones no longer installed — an uninstalled agent's config file
+ * outlives it, and a token left in a file nobody looks at is the worst
+ * place for one to sit.
  */
 export async function disableCommand(options) {
-    let removedEnvKeys = [];
-    let removedHooks = false;
-    try {
-        const current = readSettings();
-        if (current.exists) {
-            const result = removeTelemetrySettings(current.settings);
-            removedEnvKeys = result.removedEnvKeys;
-            removedHooks = result.removedHooks;
-            if (removedEnvKeys.length > 0 || removedHooks) {
-                writeSettings(result.settings, current.path);
-            }
-        }
-    }
-    catch (error) {
-        if (error instanceof SettingsParseError) {
-            console.error(`✗ ${error.message}`);
+    const survey = surveyAgents();
+    const requested = (options.agent ?? []).flatMap((value) => value.split(",").map((part) => part.trim().toLowerCase()));
+    if (requested.length > 0) {
+        const unknown = requested.filter((id) => !survey.some((entry) => entry.agent.id === id));
+        if (unknown.length > 0) {
+            console.error(`Unknown agent: ${unknown.join(", ")}. Valid ids: ${survey
+                .map((entry) => entry.agent.id)
+                .join(", ")}.`);
             process.exit(1);
         }
-        throw error;
     }
-    const agent = getAgentConfig();
-    if (options.revoke) {
-        if (!agent.tokenId) {
-            console.log("⚠ No token id on record, so nothing was revoked. This machine's token\n" +
-                "  was minted by an older version or on another machine — revoke it\n" +
-                "  from the dashboard instead.");
-        }
-        else if (!isLoggedIn()) {
-            console.log("⚠ Not logged in, so the token could not be revoked. Run 'clocktopus\n" +
-                "  login' and try again — the local configuration was still removed.");
+    const targets = requested.length > 0
+        ? survey.filter((entry) => requested.includes(entry.agent.id))
+        : survey;
+    const cleaned = [];
+    for (const entry of targets) {
+        try {
+            const { removed } = entry.agent.remove();
+            if (removed.length > 0)
+                cleaned.push({ label: entry.agent.label, removed });
         }
-        else {
-            try {
-                await request(`/api/agent/ingest-token?tokenId=${encodeURIComponent(agent.tokenId)}`, { method: "DELETE" });
-                console.log(`✓ Revoked ${agent.tokenPrefix ?? "the ingest token"}.`);
-            }
-            catch (error) {
-                console.error(`✗ Could not revoke the token: ${error instanceof ApiError || error instanceof Error
-                    ? error.message
-                    : "unknown error"}`);
-                console.error("  The local configuration was still removed.");
+        catch (error) {
+            if (isConfigParseError(error)) {
+                console.error(`✗ ${error.message}`);
+                process.exit(1);
             }
+            // A failure on one agent must not leave the others reporting.
+            console.error(`✗ ${entry.agent.label}: ${error instanceof Error ? error.message : "unknown error"}`);
         }
     }
-    clearAgentConfig();
-    clearHookState();
-    if (removedEnvKeys.length === 0 && !removedHooks) {
+    const agent = getAgentConfig();
+    // Revoking while another agent on this machine still has the token
+    // written would leave that one posting into a 401 forever, which looks
+    // like an idle week rather than a broken install.
+    const partial = requested.length > 0 && requested.length < survey.length;
+    if (options.revoke && partial) {
+        console.log("⚠ --revoke was ignored: it kills the token everywhere, and this run only\n" +
+            "  cleaned some of the agents on this machine. Re-run without --agent to\n" +
+            "  remove all of them, then revoke.");
+    }
+    else if (options.revoke) {
+        await revokeToken(agent);
+    }
+    if (!partial) {
+        clearAgentConfig();
+        clearHookState();
+    }
+    if (cleaned.length === 0) {
         console.log("Nothing to remove — agent telemetry was not configured here.");
         return;
     }
-    console.log(`✓ Removed ${removedEnvKeys.length} environment variable(s)${removedHooks ? " and the session hooks" : ""} from settings.json.`);
-    if (!options.revoke) {
+    for (const { label, removed } of cleaned) {
+        console.log(`✓ ${label}: removed ${removed.join(", ")}.`);
+    }
+    if (!options.revoke || partial) {
         console.log("\nThe ingest token is still valid. Revoke it with\n" +
             "  clocktopus agent disable --revoke");
     }
-    console.log("\nRestart Claude Code to stop the current session reporting.");
+    console.log(`\nRestart ${cleaned
+        .map((c) => c.label)
+        .join(" and ")} to stop the current session reporting.`);
+}
+async function revokeToken(agent) {
+    if (!agent.tokenId) {
+        console.log("⚠ No token id on record, so nothing was revoked. This machine's token\n" +
+            "  was minted by an older version or on another machine — revoke it\n" +
+            "  from the dashboard instead.");
+        return;
+    }
+    if (!isLoggedIn()) {
+        console.log("⚠ Not logged in, so the token could not be revoked. Run 'clocktopus\n" +
+            "  login' and try again — the local configuration was still removed.");
+        return;
+    }
+    try {
+        await request(`/api/agent/ingest-token?tokenId=${encodeURIComponent(agent.tokenId)}`, { method: "DELETE" });
+        console.log(`✓ Revoked ${agent.tokenPrefix ?? "the ingest token"}.`);
+    }
+    catch (error) {
+        console.error(`✗ Could not revoke the token: ${error instanceof ApiError || error instanceof Error
+            ? error.message
+            : "unknown error"}`);
+        console.error("  The local configuration was still removed.");
+    }
 }

package/dist/src/commands/agent/doctor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../../../src/commands/agent/doctor.ts"],"names":[],"mappings":"AAoCA,wBAAsB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CA8GnD"}
+{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../../../src/commands/agent/doctor.ts"],"names":[],"mappings":"AAuCA,wBAAsB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CA8CnD"}