@interactive-inc/claude-funnel 0.22.0 → 0.22.1

package/dist/index.d.ts

@@ -405,10 +405,15 @@ type Deps$13 = {
 /**
  * Per-channel persistent Claude Code session IDs, keyed by the cwd the
  * channel was launched from. The whole point is to give each (channel, cwd)
- * its own stable conversation: relaunching from the same path picks up the
- * previous claude session via `--session-id <uuid>`, while a different cwd
- * (or a different channel) gets an independent one — so sessions never
- * silently bleed across workspaces the way claude's `-c` does.
+ * its own stable conversation: relaunching from the same path resumes the
+ * previous claude session via `--resume <uuid>`, while a different cwd (or
+ * a different channel) gets an independent one — so sessions never silently
+ * bleed across workspaces the way claude's `-c` does.
+ *
+ * `get` and `create` are intentionally separate: claude's `--session-id`
+ * only accepts a fresh UUID (it errors if the session jsonl already
+ * exists), so callers must check `get` first and fall back to `create`
+ * only when there is nothing to resume.
  *
  * Storage lives under `<dir>/channels/<channel-id>/sessions.json` (channel
  * id, not name, so renames don't lose history). The file is a flat
@@ -419,10 +424,10 @@ declare class FunnelSessions {
   private readonly idGenerator;
   private readonly dir;
   constructor(deps: Deps$13);
-  /** Returns the existing session id for (channelId, cwd) or generates and persists a new one. */
-  getOrCreate(channelId: string, cwd: string): string;
   /** Returns the existing session id for (channelId, cwd) or null. */
   get(channelId: string, cwd: string): string | null;
+  /** Generates a new session id for (channelId, cwd) and persists it, overwriting any prior entry. */
+  create(channelId: string, cwd: string): string;
   /** Drops the recorded session id for (channelId, cwd). No-op if absent. */
   clear(channelId: string, cwd: string): void;
   /** Drops the whole session map for the channel (e.g. when the channel is deleted). */
@@ -484,11 +489,12 @@ declare class FunnelClaude {
   private isProcessAlive;
   private buildArgs;
   /**
-   * Decides whether funnel should inject `--session-id`. We back off when
-   * the user already passed a session-shaping flag, since combining them
-   * would either confuse claude or override the explicit user intent.
+   * Decides whether funnel should resume an existing claude session or start
+   * a freshly minted one. Backs off when the user already passed a
+   * session-shaping flag, since combining them would either confuse claude
+   * or override the explicit user intent.
    */
-  private resolveSessionId;
+  private resolveSession;
   private buildEnv;
 }
 //#endregion

package/dist/index.js

@@ -597,8 +597,8 @@ var FunnelClaude = class {
 			this.writePidFile(options.profileName);
 			this.installCleanup(options.profileName);
 		}
-		const sessionId = channel.resume ? this.resolveSessionId(channel.id, cwd, options.userArgs ?? []) : null;
-		const claudeArgs = this.buildArgs(channel.options, options.userArgs ?? [], cwd, sessionId);
+		const session = channel.resume ? this.resolveSession(channel.id, cwd, options.userArgs ?? []) : null;
+		const claudeArgs = this.buildArgs(channel.options, options.userArgs ?? [], cwd, session);
 		const env = this.buildEnv(channel.id, channel.env);
 		this.logger.info(`claude launch`, {
 			channel: options.channel,
@@ -649,25 +649,35 @@ var FunnelClaude = class {
 	isProcessAlive(pid) {
 		return this.process.isAlive(pid);
 	}
-	buildArgs(channelOptions, userArgs, cwd, sessionId) {
+	buildArgs(channelOptions, userArgs, cwd, session) {
 		const result = [...channelOptions, ...userArgs];
-		if (sessionId !== null) result.push("--session-id", sessionId);
+		if (session !== null) if (session.mode === "resume") result.push("--resume", session.id);
+		else result.push("--session-id", session.id);
 		const mcpName = this.mcp.findInstalledName(cwd);
 		if (mcpName && !result.includes("--dangerously-load-development-channels") && !result.includes("--channels")) result.push("--dangerously-load-development-channels", `server:${mcpName}`);
 		return result;
 	}
 	/**
-	* Decides whether funnel should inject `--session-id`. We back off when
-	* the user already passed a session-shaping flag, since combining them
-	* would either confuse claude or override the explicit user intent.
+	* Decides whether funnel should resume an existing claude session or start
+	* a freshly minted one. Backs off when the user already passed a
+	* session-shaping flag, since combining them would either confuse claude
+	* or override the explicit user intent.
 	*/
-	resolveSessionId(channelId, cwd, userArgs) {
+	resolveSession(channelId, cwd, userArgs) {
 		for (const arg of userArgs) {
 			if (arg === "-c" || arg === "--continue") return null;
 			if (arg === "--resume" || arg.startsWith("--resume=")) return null;
 			if (arg === "--session-id" || arg.startsWith("--session-id=")) return null;
 		}
-		return this.sessions.getOrCreate(channelId, cwd);
+		const existing = this.sessions.get(channelId, cwd);
+		if (existing !== null) return {
+			id: existing,
+			mode: "resume"
+		};
+		return {
+			id: this.sessions.create(channelId, cwd),
+			mode: "new"
+		};
 	}
 	buildEnv(channelId, channelEnv) {
 		const env = {};
@@ -1492,10 +1502,15 @@ const sessionsMapSchema = z.record(z.string(), z.string());
 /**
 * Per-channel persistent Claude Code session IDs, keyed by the cwd the
 * channel was launched from. The whole point is to give each (channel, cwd)
-* its own stable conversation: relaunching from the same path picks up the
-* previous claude session via `--session-id <uuid>`, while a different cwd
-* (or a different channel) gets an independent one — so sessions never
-* silently bleed across workspaces the way claude's `-c` does.
+* its own stable conversation: relaunching from the same path resumes the
+* previous claude session via `--resume <uuid>`, while a different cwd (or
+* a different channel) gets an independent one — so sessions never silently
+* bleed across workspaces the way claude's `-c` does.
+*
+* `get` and `create` are intentionally separate: claude's `--session-id`
+* only accepts a fresh UUID (it errors if the session jsonl already
+* exists), so callers must check `get` first and fall back to `create`
+* only when there is nothing to resume.
 *
 * Storage lives under `<dir>/channels/<channel-id>/sessions.json` (channel
 * id, not name, so renames don't lose history). The file is a flat
@@ -1511,20 +1526,18 @@ var FunnelSessions = class {
 		this.dir = deps.dir;
 		Object.freeze(this);
 	}
-	/** Returns the existing session id for (channelId, cwd) or generates and persists a new one. */
-	getOrCreate(channelId, cwd) {
+	/** Returns the existing session id for (channelId, cwd) or null. */
+	get(channelId, cwd) {
+		return this.readMap(channelId)[cwd] ?? null;
+	}
+	/** Generates a new session id for (channelId, cwd) and persists it, overwriting any prior entry. */
+	create(channelId, cwd) {
 		const map = this.readMap(channelId);
-		const existing = map[cwd];
-		if (existing) return existing;
 		const sessionId = this.idGenerator.generate();
 		map[cwd] = sessionId;
 		this.writeMap(channelId, map);
 		return sessionId;
 	}
-	/** Returns the existing session id for (channelId, cwd) or null. */
-	get(channelId, cwd) {
-		return this.readMap(channelId)[cwd] ?? null;
-	}
 	/** Drops the recorded session id for (channelId, cwd). No-op if absent. */
 	clear(channelId, cwd) {
 		const map = this.readMap(channelId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interactive-inc/claude-funnel",
-  "version": "0.22.0",
+  "version": "0.22.1",
   "description": "Hub CLI that routes external events (Slack / GitHub / Discord) to Claude Code agents through subscription channels over MCP.",
   "keywords": [
     "bun",
@@ -90,5 +90,8 @@
   },
   "engines": {
     "bun": ">=1.3.0"
+  },
+  "scripts": {
+    "prepack": "make build"
   }
 }