@interactive-inc/claude-funnel 0.18.0 → 0.20.1

package/dist/index.d.ts

@@ -63,7 +63,7 @@ type SlackListenerOptions = {
 type ScheduleListenerOptions = {
   onFired?: ScheduleOnFired;
 };
-type Deps$15 = {
+type Deps$16 = {
   fs?: FunnelFileSystem;
   process?: FunnelProcessRunner;
   logger?: FunnelLogger;
@@ -90,7 +90,7 @@ declare class FunnelConnectorFactory {
   private readonly dir;
   private readonly slackListenerOptions;
   private readonly scheduleListenerOptions;
-  constructor(deps?: Deps$15);
+  constructor(deps?: Deps$16);
   createListener(channelId: string, config: ConnectorConfig): FunnelConnectorListener;
   createAdapter(config: ConnectorConfig): FunnelConnectorAdapter | null;
   connectorDir(channelId: string, connectorId: string): string;
@@ -152,6 +152,7 @@ declare const channelConfigSchema: z.ZodObject<{
   }>>;
   options: z.ZodDefault<z.ZodArray<z.ZodString>>;
   env: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodString>>;
+  resume: z.ZodDefault<z.ZodBoolean>;
   connectors: z.ZodDefault<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
     id: z.ZodString;
     name: z.ZodString;
@@ -212,6 +213,7 @@ declare const settingsSchema: z.ZodObject<{
     }>>;
     options: z.ZodDefault<z.ZodArray<z.ZodString>>;
     env: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodString>>;
+    resume: z.ZodDefault<z.ZodBoolean>;
     connectors: z.ZodDefault<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
       id: z.ZodString;
       name: z.ZodString;
@@ -268,7 +270,7 @@ declare abstract class FunnelSettingsReader {
 }
 //#endregion
 //#region lib/engine/channels/channels.d.ts
-type Deps$14 = {
+type Deps$15 = {
   store: FunnelSettingsReader;
   factory: FunnelConnectorFactory;
   profileChecker: ProfileChannelChecker;
@@ -311,7 +313,7 @@ declare class FunnelChannels {
   private readonly profileChecker;
   private readonly clock;
   private readonly idGenerator;
-  constructor(deps: Deps$14);
+  constructor(deps: Deps$15);
   list(): ChannelConfig[];
   get(name: string): ChannelConfig | null;
   getById(id: string): ChannelConfig | null;
@@ -320,8 +322,10 @@ declare class FunnelChannels {
     delivery?: ChannelDeliveryMode;
     options?: string[];
     env?: Record<string, string>;
+    resume?: boolean;
   }): ChannelConfig;
   setDelivery(name: string, delivery: ChannelDeliveryMode): void;
+  setResume(name: string, resume: boolean): void;
   setOptions(name: string, options: string[]): void;
   setEnv(name: string, env: Record<string, string>): void;
   remove(name: string): void;
@@ -373,7 +377,7 @@ type GatewayController = {
 //#region lib/engine/mcp/mcp.d.ts
 declare const FUNNEL_MCP_COMMAND = "funnel";
 declare const FUNNEL_MCP_NAME = "funnel";
-type Deps$13 = {
+type Deps$14 = {
   fs?: FunnelFileSystem;
 };
 /**
@@ -383,7 +387,7 @@ type Deps$13 = {
  */
 declare class FunnelMcp {
   private readonly fs;
-  constructor(deps?: Deps$13);
+  constructor(deps?: Deps$14);
   install(repoPath: string): void;
   uninstall(repoPath: string): void;
   findInstalledName(cwd: string): string | null;
@@ -392,6 +396,43 @@ declare class FunnelMcp {
   private writeConfig;
 }
 //#endregion
+//#region lib/engine/sessions/sessions.d.ts
+type Deps$13 = {
+  fs: FunnelFileSystem;
+  idGenerator: FunnelIdGenerator;
+  dir: 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.
+ *
+ * Storage lives under `<dir>/channels/<channel-id>/sessions.json` (channel
+ * id, not name, so renames don't lose history). The file is a flat
+ * `{ cwd: uuid }` map; the channel directory itself is created lazily.
+ */
+declare class FunnelSessions {
+  private readonly fs;
+  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;
+  /** 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). */
+  clearAll(channelId: string): void;
+  private readMap;
+  private writeMap;
+  private channelDir;
+  private pathFor;
+}
+//#endregion
 //#region lib/engine/claude/claude.d.ts
 type LaunchOptions = {
   channel: string;
@@ -402,11 +443,16 @@ type LaunchOptions = {
    *  Useful for hosts that need to register the spawned process before it exits
    *  (e.g. multi-session registries that track per-claude liveness). */
   onSpawned?: (pid: number) => void;
+  /** Whether to install the funnel MCP entry into `.mcp.json` (default: true).
+   *  Set to false when the host already provides its own MCP server entry and
+   *  does not need the funnel binary as an MCP endpoint. */
+  installMcp?: boolean;
 };
 type Deps$12 = {
   channels: FunnelChannels;
   mcp: FunnelMcp;
   gateway: GatewayController;
+  sessions: FunnelSessions;
   process?: FunnelProcessRunner;
   fs?: FunnelFileSystem;
   logger?: FunnelLogger;
@@ -422,6 +468,7 @@ declare class FunnelClaude {
   private readonly channels;
   private readonly mcp;
   private readonly gateway;
+  private readonly sessions;
   private readonly process;
   private readonly fs;
   private readonly logger;
@@ -436,6 +483,12 @@ declare class FunnelClaude {
   private installCleanup;
   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.
+   */
+  private resolveSessionId;
   private buildEnv;
 }
 //#endregion
@@ -485,6 +538,7 @@ declare const channelSpecSchema: z.ZodObject<{
   name: z.ZodString;
   options: z.ZodOptional<z.ZodArray<z.ZodString>>;
   env: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+  resume: z.ZodOptional<z.ZodBoolean>;
   connectors: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
     type: z.ZodLiteral<"slack">;
     name: z.ZodString;
@@ -517,6 +571,7 @@ declare const localConfigSchema: z.ZodObject<{
     name: z.ZodString;
     options: z.ZodOptional<z.ZodArray<z.ZodString>>;
     env: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    resume: z.ZodOptional<z.ZodBoolean>;
     connectors: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
       type: z.ZodLiteral<"slack">;
       name: z.ZodString;
@@ -581,6 +636,14 @@ type Deps$9 = {
   prompter: FunnelTokenPrompter;
   env?: NodeJS.ProcessEnv;
 };
+type ConnectorSyncOutcome = {
+  name: string;
+  changed: boolean;
+};
+type LocalConfigSyncResult = {
+  touched: ConnectorSyncOutcome[];
+  removed: string[];
+};
 /**
  * Reconciles a single funnel.json channel spec with `~/.funnel/settings.json`.
  * The spec is the source of truth for the channel it declares:
@@ -596,6 +659,9 @@ type Deps$9 = {
  * absent field means "do not manage connectors from here" and leaves
  * everything in `~/.funnel` alone. Other channels in funnel.json (not
  * passed to this call) are untouched.
+ *
+ * Returns the per-connector change set so callers (e.g. the claude launcher)
+ * can drive listener hot-reload on the gateway after settings are written.
  */
 declare class FunnelLocalConfigSync {
   private readonly channels;
@@ -603,7 +669,7 @@ declare class FunnelLocalConfigSync {
   private readonly prompter;
   private readonly env;
   constructor(deps: Deps$9);
-  ensure(channel: ChannelSpec, cwd: string): Promise<void>;
+  ensure(channel: ChannelSpec, cwd: string): Promise<LocalConfigSyncResult>;
   private ensureConnector;
   private ensureSlack;
   private ensureDiscord;
@@ -1311,6 +1377,8 @@ declare class Funnel {
   get channels(): FunnelChannels;
   /** Launch profiles (named presets for `fnl claude`: path + sub-agent + channel id). */
   get profiles(): FunnelProfiles;
+  /** Per-(channel, cwd) claude session-id store. Backs `--session-id` injection on launch. */
+  get sessions(): FunnelSessions;
   /** Reads `funnel.json` from a cwd. `fnl claude` consults it before falling back to the default profile. */
   get localConfig(): FunnelLocalConfig;
   /** Parses `.env.local` from a cwd (used by sync to back $VAR references). */
@@ -4195,4 +4263,4 @@ ${string}`;
 //#region lib/tui/tui.d.ts
 declare function launchTui(funnel: Funnel): Promise<void>;
 //#endregion
-export { AttachOptions, BroadcastEvent, BroadcastSubscriber, ChannelConfig, ChannelConnectorView, ChannelDeliveryMode, ChannelServerOptions, ChannelSpec, ConnectorConfig, ConnectorSpec, ConnectorType, DEFAULT_GATEWAY_TOKEN_PATH, DetachOptions, DiscordConnectorConfig, Env, FUNNEL_DIR, FUNNEL_MCP_COMMAND, FUNNEL_MCP_NAME, FileStat, Funnel, FunnelBroadcaster, FunnelChannelPublisher, FunnelChannels, FunnelClaude, FunnelClock, FunnelConnectorFactory, FunnelConnectorListener, FunnelDotenvReader, FunnelEvent, FunnelEventStore, FunnelFileSystem, FunnelGateway, FunnelGatewayServer, FunnelGatewayToken, FunnelIdGenerator, FunnelListenerSupervisor, FunnelListenersClient, FunnelLocalConfig, FunnelLocalConfigSync, FunnelLogger, FunnelMcp, FunnelProcessRunner, FunnelProfiles, FunnelSettingsReader, FunnelSettingsStore, FunnelSlackEventProcessor, FunnelTokenPrompter, type GatewayEmitInput, type GatewayRouteDeps, type Env$1 as GatewayServerEnv, GhConnectorConfig, LOCAL_CONFIG_FILENAME, LOCAL_ENV_FILENAME, LaunchOptions, ListListenersResult, ListenerEntry, ListenerOpResult, LocalConfig, LogEntry, MemoryFunnelClock, MemoryFunnelFileSystem, MemoryFunnelIdGenerator, MemoryFunnelLogger, MemoryFunnelProcessRunner, MemoryFunnelTokenPrompter, MemoryProcessCall, MemoryProcessHandler, MemoryProcessResponse, MemoryProcessSyncHandler, MockFunnelSettingsReader, NodeFunnelClock, NodeFunnelFileSystem, NodeFunnelIdGenerator, NodeFunnelLogger, NodeFunnelProcessRunner, NodeFunnelTokenPrompter, NoopFunnelLogger, NotifyFn, ProfileConfig, PublishRequest, PublishResponse, PublishResult, ReplayableEvent, RunOptions, RunResult, SETTINGS_PATH, SETTINGS_VERSION, ScheduleCatchupPolicy, ScheduleConnectorConfig, ScheduleEntry, ScheduleListenerOptions, Settings, SlackConnectorConfig, SlackListenerOptions, SlackProcessed, SlackProcessedEmit, SlackProcessedSkip, SlackRawEvent, channelConfigSchema, channelDeliveryModeSchema, channelSpecSchema, app as cliApp, connectorConfigSchema, connectorSpecSchema, createCliApp, createSettings, discordConnectorSchema, factory, funnelEventSchema, funnelJsonSchema, ghConnectorSchema, launchTui, localConfigSchema, profileConfigSchema, publishRequestSchema, publishResponseSchema, queryToCliArgs, scheduleCatchupPolicySchema, scheduleConnectorSchema, scheduleEntrySchema, settingsSchema, slackConnectorSchema, startChannelServer, toRequest };
+export { AttachOptions, BroadcastEvent, BroadcastSubscriber, ChannelConfig, ChannelConnectorView, ChannelDeliveryMode, ChannelServerOptions, ChannelSpec, ConnectorConfig, ConnectorSpec, ConnectorSyncOutcome, ConnectorType, DEFAULT_GATEWAY_TOKEN_PATH, DetachOptions, DiscordConnectorConfig, Env, FUNNEL_DIR, FUNNEL_MCP_COMMAND, FUNNEL_MCP_NAME, FileStat, Funnel, FunnelBroadcaster, FunnelChannelPublisher, FunnelChannels, FunnelClaude, FunnelClock, FunnelConnectorFactory, FunnelConnectorListener, FunnelDotenvReader, FunnelEvent, FunnelEventStore, FunnelFileSystem, FunnelGateway, FunnelGatewayServer, FunnelGatewayToken, FunnelIdGenerator, FunnelListenerSupervisor, FunnelListenersClient, FunnelLocalConfig, FunnelLocalConfigSync, FunnelLogger, FunnelMcp, FunnelProcessRunner, FunnelProfiles, FunnelSessions, FunnelSettingsReader, FunnelSettingsStore, FunnelSlackEventProcessor, FunnelTokenPrompter, type GatewayEmitInput, type GatewayRouteDeps, type Env$1 as GatewayServerEnv, GhConnectorConfig, LOCAL_CONFIG_FILENAME, LOCAL_ENV_FILENAME, LaunchOptions, ListListenersResult, ListenerEntry, ListenerOpResult, LocalConfig, LocalConfigSyncResult, LogEntry, MemoryFunnelClock, MemoryFunnelFileSystem, MemoryFunnelIdGenerator, MemoryFunnelLogger, MemoryFunnelProcessRunner, MemoryFunnelTokenPrompter, MemoryProcessCall, MemoryProcessHandler, MemoryProcessResponse, MemoryProcessSyncHandler, MockFunnelSettingsReader, NodeFunnelClock, NodeFunnelFileSystem, NodeFunnelIdGenerator, NodeFunnelLogger, NodeFunnelProcessRunner, NodeFunnelTokenPrompter, NoopFunnelLogger, NotifyFn, ProfileConfig, PublishRequest, PublishResponse, PublishResult, ReplayableEvent, RunOptions, RunResult, SETTINGS_PATH, SETTINGS_VERSION, ScheduleCatchupPolicy, ScheduleConnectorConfig, ScheduleEntry, ScheduleListenerOptions, Settings, SlackConnectorConfig, SlackListenerOptions, SlackProcessed, SlackProcessedEmit, SlackProcessedSkip, SlackRawEvent, channelConfigSchema, channelDeliveryModeSchema, channelSpecSchema, app as cliApp, connectorConfigSchema, connectorSpecSchema, createCliApp, createSettings, discordConnectorSchema, factory, funnelEventSchema, funnelJsonSchema, ghConnectorSchema, launchTui, localConfigSchema, profileConfigSchema, publishRequestSchema, publishResponseSchema, queryToCliArgs, scheduleCatchupPolicySchema, scheduleConnectorSchema, scheduleEntrySchema, settingsSchema, slackConnectorSchema, startChannelServer, toRequest };