@unlinearity/cli-wechat-bridge 1.1.5 → 1.2.0

package/dist/bridge/bridge-adapters.core.js

@@ -1,9 +1,16 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// Copyright (c) 2026 UNLINEARITY <unlinearity@gmail.com>
+// Source: https://github.com/UNLINEARITY/CLI-WeChat-Bridge
+// This file is part of CLI-WeChat-Bridge. Modifications and derivative works
+// must be released under AGPL-3.0-or-later with full source code; see
+// LICENSE.txt. Network services built on it must offer source to users.
 import net from "node:net";
 import path from "node:path";
 import { spawn as spawnPty } from "node-pty";
 import { t } from "../i18n/index.js";
 import { attachLocalCompanionMessageListener, buildLocalCompanionToken, clearLocalCompanionEndpoint, clearLocalCompanionOccupancy, sendLocalCompanionMessage, updateLocalCompanionOccupancy, writeLocalCompanionEndpoint, } from "../companion/local-companion-link.js";
-import { detectCliApproval, normalizeOutput, nowIso, truncatePreview, } from "./bridge-utils.js";
+import { detectCliApproval, } from "./bridge-utils.js";
+import { normalizeOutput, nowIso, truncatePreview } from "../core/text-utils.js";
 import * as shared from "./bridge-adapters.shared.js";
 import { LOCAL_CLIENT_PROTOCOL_VERSION } from "../runtime/runtime-types.js";
 const { CODEX_APP_SERVER_HOST, INTERRUPT_SETTLE_DELAY_MS, buildCliEnvironment, buildPtySpawnOptions, buildSpawnDiagnostic, getLocalCompanionCommandName, getSharedSessionIdFromAdapterState, LOCAL_COMPANION_RECONNECT_GRACE_MS, resolveSpawnTarget, spawnFallbackProcess, } = shared;
@@ -14,7 +21,7 @@ const { CODEX_APP_SERVER_HOST, INTERRUPT_SETTLE_DELAY_MS, buildCliEnvironment, b
  * the script path contains spaces: node-pty quotes the already-quoted path,
  * making cmd.exe treat the literal quotes as part of the filename.
  */
-function unwrapCmdExeForPty(rawTarget) {
+export function unwrapCmdExeForPty(rawTarget) {
     if (process.platform !== "win32") {
         return rawTarget;
     }
@@ -165,6 +172,15 @@ export class LocalCompanionProxyAdapter {
             command: "create_session",
         });
     }
+    async listModels() {
+        return await this.sendRequest({ command: "list_models" });
+    }
+    async selectModel(modelId) {
+        return await this.sendRequest({ command: "select_model", modelId });
+    }
+    async setPlanMode(enabled) {
+        return await this.sendRequest({ command: "set_plan_mode", enabled });
+    }
     async interrupt() {
         const result = await this.sendRequest({
             command: "interrupt",
@@ -611,6 +627,15 @@ export class AbstractPtyAdapter {
     setEventSink(sink) {
         this.eventSink = sink;
     }
+    async listModels() {
+        throw new Error(`/${this.options.kind} model selection is not available.`);
+    }
+    async selectModel(_modelId) {
+        throw new Error(`/${this.options.kind} model selection is not available.`);
+    }
+    async setPlanMode(_enabled) {
+        throw new Error(`/${this.options.kind} plan mode is not available.`);
+    }
     async start() {
         if (this.pty) {
             return;

package/dist/bridge/bridge-adapters.opencode.js

@@ -1,3 +1,9 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// Copyright (c) 2026 UNLINEARITY <unlinearity@gmail.com>
+// Source: https://github.com/UNLINEARITY/CLI-WeChat-Bridge
+// This file is part of CLI-WeChat-Bridge. Modifications and derivative works
+// must be released under AGPL-3.0-or-later with full source code; see
+// LICENSE.txt. Network services built on it must offer source to users.
 import { spawn as spawnChildProcess } from "node:child_process";
 import { randomBytes } from "node:crypto";
 import fs from "node:fs";
@@ -85,6 +91,139 @@ export class OpenCodeServerAdapter {
     pendingLocalSessionCreateFollowUntilMs = 0;
     pendingPermission = null;
     pendingQuestion = null;
+    previousAgentBySession = new Map();
+    async listModels() {
+        this.assertRemoteControlReady();
+        const session = await this.ensureControlSession();
+        const models = await this.listControlModels();
+        return models.map((model) => ({
+            id: model.id,
+            displayName: model.displayName,
+            isCurrent: session.model?.providerID === model.providerID &&
+                session.model.id === model.modelID,
+        }));
+    }
+    async selectModel(modelId) {
+        this.assertRemoteControlReady();
+        const session = await this.ensureControlSession();
+        const models = await this.listControlModels();
+        const target = models.find((model) => model.id === modelId);
+        if (!target) {
+            throw new Error("This OpenCode model is no longer available. Send /model again.");
+        }
+        const currentVariant = session.model?.variant;
+        const variant = currentVariant && currentVariant !== "default" && target.variants.includes(currentVariant)
+            ? currentVariant
+            : "default";
+        const result = await this.client.v2.session.switchModel({
+            sessionID: session.id,
+            model: {
+                providerID: target.providerID,
+                id: target.modelID,
+                variant,
+            },
+        });
+        this.unwrapOrThrow(result);
+        const updated = await this.getSessionForCurrentDirectory(session.id);
+        if (!updated ||
+            updated.model?.providerID !== target.providerID ||
+            updated.model.id !== target.modelID ||
+            (updated.model.variant ?? "default") !== variant) {
+            throw new Error("OpenCode did not confirm the selected model.");
+        }
+        return { id: target.id, displayName: target.displayName, isCurrent: true };
+    }
+    async setPlanMode(enabled) {
+        this.assertRemoteControlReady();
+        const session = await this.ensureControlSession();
+        const agents = await this.listPrimaryAgents();
+        const planAgent = agents.find((agent) => agent.name === "plan");
+        if (!planAgent) {
+            throw new Error("OpenCode primary agent 'plan' is not available.");
+        }
+        const currentAgent = session.agent ?? agents[0]?.name;
+        if (!currentAgent) {
+            throw new Error("OpenCode did not return any primary agents.");
+        }
+        if (enabled && currentAgent === "plan") {
+            return true;
+        }
+        if (!enabled && currentAgent !== "plan") {
+            this.previousAgentBySession.delete(session.id);
+            return false;
+        }
+        const previousAgent = this.previousAgentBySession.get(session.id);
+        const target = enabled
+            ? "plan"
+            : agents.some((agent) => agent.name === previousAgent)
+                ? previousAgent
+                : agents.find((agent) => agent.name === "build")?.name ??
+                    agents.find((agent) => agent.name !== "plan")?.name;
+        if (!target) {
+            throw new Error("OpenCode did not return an agent that can replace plan mode.");
+        }
+        const result = await this.client.v2.session.switchAgent({
+            sessionID: session.id,
+            agent: target,
+        });
+        this.unwrapOrThrow(result);
+        const updated = await this.getSessionForCurrentDirectory(session.id);
+        if (!updated || updated.agent !== target) {
+            throw new Error("OpenCode did not confirm the selected agent.");
+        }
+        if (enabled) {
+            this.previousAgentBySession.set(session.id, currentAgent);
+        }
+        else {
+            this.previousAgentBySession.delete(session.id);
+        }
+        return enabled;
+    }
+    assertRemoteControlReady() {
+        if (!this.client) {
+            throw new Error("OpenCode is not running.");
+        }
+        if (this.state.status === "busy") {
+            throw new Error("OpenCode is still working. Wait for the current reply or use /stop.");
+        }
+        if (this.pendingPermission) {
+            throw new Error("An OpenCode approval request is pending. Reply with /confirm or /deny.");
+        }
+        if (this.pendingQuestion) {
+            throw new Error("OpenCode is waiting for user input. Reply with /answer or use /stop.");
+        }
+    }
+    async ensureControlSession() {
+        const session = await this.ensureSession();
+        if (session.id !== this.activeSessionId) {
+            this.switchSharedSession(session, {
+                source: "wechat",
+                reason: "wechat_resume",
+                syncVisible: true,
+                forceVisibleSync: true,
+            });
+        }
+        return session;
+    }
+    async listPrimaryAgents() {
+        if (!this.client)
+            throw new Error("OpenCode is not running.");
+        const agents = this.unwrapOrThrow(await this.client.app.agents({
+            directory: this.options.cwd,
+            workspace: this.activeWorkspaceId ?? undefined,
+        }, { signal: AbortSignal.timeout(10_000) }));
+        return agents.filter((agent) => agent.mode !== "subagent" && !agent.hidden);
+    }
+    async listControlModels() {
+        if (!this.client)
+            throw new Error("OpenCode is not running.");
+        const providers = this.unwrapOrThrow(await this.client.provider.list({ directory: this.options.cwd, workspace: this.activeWorkspaceId ?? undefined }, { signal: AbortSignal.timeout(10_000) }));
+        return providers.all.filter((provider) => providers.connected.includes(provider.id)).flatMap((provider) => Object.entries(provider.models).filter(([id, model]) => model.status !== "deprecated" && !(provider.id === "opencode" && id.includes("-nano"))).map(([id, model]) => ({
+            id: `${provider.id}/${id}`, displayName: `${model.name || id} (${provider.name})`,
+            providerID: provider.id, modelID: id,
+            variants: Object.keys(model.variants ?? {}),
+        })));
+    }
     constructor(options) {
         this.options = options;
         this.state = {
@@ -170,10 +309,21 @@ export class OpenCodeServerAdapter {
         this.recordPendingWechatPromptMirrorSuppression(session.id, normalized);
         this.beginTrackedTurn(normalized, "wechat");
         try {
+            const selection = await this.getSessionForCurrentDirectory(session.id) ?? session;
             const result = await this.client.session.promptAsync({
                 sessionID: session.id,
                 directory: this.options.cwd,
                 workspace: session.workspaceID ?? this.activeWorkspaceId ?? undefined,
+                ...(selection.agent ? { agent: selection.agent } : {}),
+                ...(selection.model
+                    ? {
+                        model: {
+                            providerID: selection.model.providerID,
+                            modelID: selection.model.id,
+                        },
+                        variant: selection.model.variant ?? "default",
+                    }
+                    : {}),
                 parts: [{ type: "text", text: normalized }],
             });
             if (result.error !== undefined) {
@@ -411,6 +561,7 @@ export class OpenCodeServerAdapter {
         this.pendingLocalSessionCreateFollowUntilMs = 0;
         this.clearObservedMessageTracking();
         this.recentSdkEventObservations.clear();
+        this.previousAgentBySession.clear();
         this.outputBatcher.clear();
         this.clearStreamedPartState();
         this.clearPendingPermissionState();
@@ -1535,7 +1686,11 @@ export class OpenCodeServerAdapter {
             return;
         }
         const sessionId = this.extractSessionId(properties);
-        if (!sessionId || sessionId !== this.activeSessionId) {
+        if (!sessionId) {
+            return;
+        }
+        this.previousAgentBySession.delete(sessionId);
+        if (sessionId !== this.activeSessionId) {
             return;
         }
         this.clearTrackedTurnForLocalSessionSwitch();

package/dist/bridge/bridge-adapters.pi.js

@@ -1,3 +1,9 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// Copyright (c) 2026 UNLINEARITY <unlinearity@gmail.com>
+// Source: https://github.com/UNLINEARITY/CLI-WeChat-Bridge
+// This file is part of CLI-WeChat-Bridge. Modifications and derivative works
+// must be released under AGPL-3.0-or-later with full source code; see
+// LICENSE.txt. Network services built on it must offer source to users.
 import crypto from "node:crypto";
 import fs from "node:fs";
 import net from "node:net";
@@ -7,7 +13,7 @@ import { spawn } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import { assertNoReservedExtraCliArgs, buildCliEnvironment, describeUnknownError, isRecord, resolveSpawnTarget, } from "./bridge-adapters.shared.js";
 import { killProcessTreeSync } from "./bridge-process-reaper.js";
-import { normalizeOutput, nowIso } from "./bridge-utils.js";
+import { normalizeOutput, nowIso } from "../core/text-utils.js";
 const PI_TUI_CONNECT_WARNING_MS = 30_000;
 const PI_TUI_REQUEST_TIMEOUT_MS = 30_000;
 const PI_TUI_RECONNECT_TIMEOUT_MS = 10_000;
@@ -356,6 +362,41 @@ export class PiTuiAdapter {
             this.pendingSessionSwitch = null;
         }
     }
+    async listModels() {
+        if (this.state.status === "busy") {
+            throw new Error("Pi is still working. Wait for the current turn before listing models.");
+        }
+        const response = await this.sendCommand("list_models");
+        if (!isRecord(response.data) || !Array.isArray(response.data.models)) {
+            throw new Error("Pi TUI returned an invalid model list.");
+        }
+        return response.data.models
+            .filter((model) => isRecord(model))
+            .filter((model) => typeof model.id === "string" && typeof model.displayName === "string")
+            .map((model) => ({
+            id: model.id,
+            displayName: model.displayName,
+            isCurrent: model.isCurrent === true,
+        }));
+    }
+    async selectModel(modelId) {
+        if (this.state.status === "busy") {
+            throw new Error("Pi is still working. Wait for the current turn before switching models.");
+        }
+        const response = await this.sendCommand("select_model", { modelId });
+        if (!isRecord(response.data) || !isRecord(response.data.model)) {
+            throw new Error("Pi TUI returned an invalid selected model.");
+        }
+        const model = response.data.model;
+        if (typeof model.id !== "string" || typeof model.displayName !== "string") {
+            throw new Error("Pi TUI returned an invalid selected model.");
+        }
+        return {
+            id: model.id,
+            displayName: model.displayName,
+            isCurrent: true,
+        };
+    }
     async interrupt() {
         if (!this.socket || this.state.status !== "busy") {
             return false;
@@ -569,6 +610,10 @@ export class PiTuiAdapter {
             else if (this.currentAssistantText) {
                 this.emit({ type: "final_reply", text: this.currentAssistantText, timestamp: nowIso() });
             }
+            // Mirror the other adapters: a settled turn always reports completion so
+            // bridge/daemon ownership state is released even when the turn produced
+            // no visible reply.
+            this.emit({ type: "task_complete", timestamp: nowIso() });
             this.state.lastOutputAt = nowIso();
             this.clearActiveTurn();
             this.setStatus("idle");

package/dist/bridge/bridge-adapters.shared.js

@@ -1,3 +1,9 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// Copyright (c) 2026 UNLINEARITY <unlinearity@gmail.com>
+// Source: https://github.com/UNLINEARITY/CLI-WeChat-Bridge
+// This file is part of CLI-WeChat-Bridge. Modifications and derivative works
+// must be released under AGPL-3.0-or-later with full source code; see
+// LICENSE.txt. Network services built on it must offer source to users.
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
@@ -6,7 +12,8 @@ import { fileURLToPath } from "node:url";
 import { spawn, spawnSync } from "node:child_process";
 import { t } from "../i18n/index.js";
 import { spawn as spawnPty } from "node-pty";
-import { WECHAT_OUTBOUND_ATTACHMENT_DENY_MESSAGE, containsWechatOutboundAttachmentPath, containsWechatOutboundAttachmentPathDeep, isWechatOutboundAttachmentWriteCommand, isHighRiskShellCommand, isStrictApprovalModeEnabled, normalizeOutput, truncatePreview, } from "./bridge-utils.js";
+import { WECHAT_OUTBOUND_ATTACHMENT_DENY_MESSAGE, containsWechatOutboundAttachmentPath, containsWechatOutboundAttachmentPathDeep, isWechatOutboundAttachmentWriteCommand, isHighRiskShellCommand, isStrictApprovalModeEnabled, } from "./bridge-utils.js";
+import { normalizeOutput, truncatePreview } from "../core/text-utils.js";
 import { getNotificationThreadId, isRecord, } from "./bridge-adapter-common.js";
 export { coerceWebSocketMessageData, describeUnknownError, getCodexRpcRequestId, getLocalCompanionCommandName, getNotificationThreadId, getNotificationTurnId, getSharedSessionIdFromAdapterState, isRecentIsoTimestamp, isRecord, normalizeCodexRpcError, quotePosixCommandArg, quoteWindowsCommandArg, } from "./bridge-adapter-common.js";
 export const DEFAULT_COLS = 120;

package/dist/bridge/bridge-controller.js

@@ -1,3 +1,9 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// Copyright (c) 2026 UNLINEARITY <unlinearity@gmail.com>
+// Source: https://github.com/UNLINEARITY/CLI-WeChat-Bridge
+// This file is part of CLI-WeChat-Bridge. Modifications and derivative works
+// must be released under AGPL-3.0-or-later with full source code; see
+// LICENSE.txt. Network services built on it must offer source to users.
 import { clearLocalCompanionEndpoint, readLocalCompanionEndpoint, writeLocalCompanionEndpoint, } from "../companion/local-companion-link.js";
 import { hasLocalClientEndpointProvider } from "../runtime/runtime-types.js";
 export class BridgeController {

package/dist/bridge/bridge-final-reply.js

@@ -1,65 +1,8 @@
-import { formatFinalReplyMessage, parseWechatFinalReply, sanitizeWechatFinalReplyText, splitWechatTextIntoChunks, } from "./bridge-utils.js";
-export const OPENCODE_EMPTY_VISIBLE_REPLY_MESSAGE = "OpenCode 没有产生可发送到微信的可见回复。请查看本地终端输出，或重试这条消息。";
-export async function forwardWechatFinalReply(params) {
-    const { adapter, rawText, sender, onEmptyVisibleReply } = params;
-    const parsed = parseWechatFinalReply(rawText);
-    const sanitizedText = sanitizeWechatFinalReplyText(adapter, parsed.visibleText);
-    const visibleText = formatFinalReplyMessage(adapter, sanitizedText).trim();
-    if (visibleText) {
-        // Send long replies in bounded chunks: a single oversized sendmessage call
-        // can be rejected by the WeChat API, silently losing the whole reply.
-        const chunks = splitWechatTextIntoChunks(visibleText);
-        for (let index = 0; index < chunks.length; index += 1) {
-            const sent = await sender.sendText(chunks[index]);
-            if (sent === false) {
-                // The send channel is failing (e.g. an expired context token).
-                // Report what was dropped instead of ending mid-reply silently;
-                // this notice itself is best effort and may also fail.
-                const remainingChunks = chunks.length - index - 1;
-                if (remainingChunks > 0 || parsed.attachments.length > 0) {
-                    const parts = [];
-                    if (remainingChunks > 0) {
-                        parts.push(`${remainingChunks} reply chunk(s)`);
-                    }
-                    if (parsed.attachments.length > 0) {
-                        parts.push(`${parsed.attachments.length} attachment(s)`);
-                    }
-                    await sender.sendText(`[bridge] Reply delivery was interrupted; ${parts.join(" and ")} could not be sent. Send a new message to retry.`);
-                }
-                return;
-            }
-        }
-    }
-    else if (adapter === "opencode" && parsed.visibleText.trim()) {
-        onEmptyVisibleReply?.({
-            adapter,
-            rawVisibleText: parsed.visibleText,
-        });
-        const sent = await sender.sendText(OPENCODE_EMPTY_VISIBLE_REPLY_MESSAGE);
-        if (sent === false) {
-            return;
-        }
-    }
-    for (const attachment of parsed.attachments) {
-        try {
-            switch (attachment.kind) {
-                case "image":
-                    await sender.sendImage(attachment.path);
-                    break;
-                case "file":
-                    await sender.sendFile(attachment.path);
-                    break;
-                case "voice":
-                    await sender.sendVoice(attachment.path);
-                    break;
-                case "video":
-                    await sender.sendVideo(attachment.path);
-                    break;
-            }
-        }
-        catch (error) {
-            const errorText = error instanceof Error ? error.message : String(error ?? "unknown error");
-            await sender.sendText(`Failed to send ${attachment.kind} attachment: ${attachment.path}\n${errorText}`);
-        }
-    }
-}
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// Copyright (c) 2026 UNLINEARITY <unlinearity@gmail.com>
+// Source: https://github.com/UNLINEARITY/CLI-WeChat-Bridge
+// This file is part of CLI-WeChat-Bridge. Modifications and derivative works
+// must be released under AGPL-3.0-or-later with full source code; see
+// LICENSE.txt. Network services built on it must offer source to users.
+/** @deprecated Import from ../channels/wechat/bridge-final-reply.ts instead. */
+export * from "../channels/wechat/bridge-final-reply.js";

package/dist/bridge/bridge-process-reaper.js

@@ -1,3 +1,9 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// Copyright (c) 2026 UNLINEARITY <unlinearity@gmail.com>
+// Source: https://github.com/UNLINEARITY/CLI-WeChat-Bridge
+// This file is part of CLI-WeChat-Bridge. Modifications and derivative works
+// must be released under AGPL-3.0-or-later with full source code; see
+// LICENSE.txt. Network services built on it must offer source to users.
 import { spawnSync } from "node:child_process";
 import path from "node:path";
 const PEER_BRIDGE_EXIT_TIMEOUT_MS = 4_000;
@@ -113,7 +119,7 @@ function normalizeBridgeProcessRecord(value) {
     }
     return record;
 }
-export function parseWindowsBridgeProcessProbeOutput(stdout, currentPid = process.pid) {
+function parseWindowsProcessProbeRecords(stdout) {
     const trimmed = stdout.trim();
     if (!trimmed) {
         return [];
@@ -128,7 +134,13 @@ export function parseWindowsBridgeProcessProbeOutput(stdout, currentPid = proces
     const values = Array.isArray(parsed) ? parsed : [parsed];
     return values
         .map(normalizeBridgeProcessRecord)
-        .filter((record) => Boolean(record))
+        .filter((record) => Boolean(record));
+}
+export function parseWindowsProcessRecordProbeOutput(stdout, currentPid = process.pid) {
+    return (parseWindowsProcessProbeRecords(stdout).find((record) => record.pid !== currentPid) ?? null);
+}
+export function parseWindowsBridgeProcessProbeOutput(stdout, currentPid = process.pid) {
+    return parseWindowsProcessProbeRecords(stdout)
         .filter((record) => record.pid !== currentPid && isWechatBridgeCommandLine(record.commandLine));
 }
 export function parsePosixBridgeProcessProbeOutput(stdout, currentPid = process.pid) {
@@ -195,10 +207,37 @@ export function listPeerBridgeProcesses(currentPid = process.pid) {
         ? listWindowsBridgeProcesses(currentPid)
         : listPosixBridgeProcesses(currentPid);
 }
+function getWindowsProcessRecordByPid(pid, currentPid = process.pid) {
+    const probe = spawnSync("powershell.exe", [
+        "-NoLogo",
+        "-NoProfile",
+        "-NonInteractive",
+        "-ExecutionPolicy",
+        "Bypass",
+        "-Command",
+        [
+            "$ErrorActionPreference='Stop';",
+            `Get-CimInstance Win32_Process -Filter 'ProcessId = ${pid}'`,
+            "| Select-Object ProcessId,ParentProcessId,Name,CommandLine",
+            "| ConvertTo-Json -Compress",
+        ].join(" "),
+    ], {
+        encoding: "utf8",
+        windowsHide: true,
+        timeout: 8_000,
+    });
+    if (probe.status !== 0 || typeof probe.stdout !== "string") {
+        return null;
+    }
+    return parseWindowsProcessRecordProbeOutput(probe.stdout, currentPid);
+}
 export function getProcessRecordByPid(pid, currentPid = process.pid) {
     if (!Number.isInteger(pid) || pid <= 0 || pid === currentPid) {
         return null;
     }
+    if (process.platform === "win32") {
+        return getWindowsProcessRecordByPid(pid, currentPid);
+    }
     return listAllProcessesRaw(currentPid).find((record) => record.pid === pid) ?? null;
 }
 export function listWechatDaemonProcesses(params = {}) {

package/dist/bridge/bridge-state.js

@@ -1,6 +1,12 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// Copyright (c) 2026 UNLINEARITY <unlinearity@gmail.com>
+// Source: https://github.com/UNLINEARITY/CLI-WeChat-Bridge
+// This file is part of CLI-WeChat-Bridge. Modifications and derivative works
+// must be released under AGPL-3.0-or-later with full source code; see
+// LICENSE.txt. Network services built on it must offer source to users.
 import fs from "node:fs";
 import { BRIDGE_LOCK_FILE, BRIDGE_LOG_FILE, appendBoundedLog, ensureWorkspaceChannelDir, ensureChannelDataDir, } from "../wechat/channel-config.js";
-import { buildInstanceId } from "./bridge-utils.js";
+import { buildInstanceId } from "../core/text-utils.js";
 import { writeJsonFileAtomic } from "../utils/atomic-file.js";
 import { getProcessRecordByPid, isWechatBridgeCommandLine, } from "./bridge-process-reaper.js";
 const ORPHAN_LOCK_RECLAIM_TIMEOUT_MS = 2_000;
@@ -79,6 +85,9 @@ export function normalizeBridgeLockPayload(value) {
         startedAt: record.startedAt,
         lifecycle: record.lifecycle === "companion_bound" ? "companion_bound" : "persistent",
         legacyLifecycleFallback: hasExplicitLifecycle ? undefined : true,
+        ...(record.channelId === "wechat" || record.channelId === "wecom"
+            ? { channelId: record.channelId }
+            : {}),
     };
 }
 export function readBridgeLockFile() {
@@ -148,11 +157,13 @@ function buildLockConflictError(lock) {
  * pid is alive but belongs to something else, and "unknown" when the command
  * line could not be resolved (probe failure, restricted permissions).
  */
-export function classifyLockHolderProcess(pid) {
-    if (!isPidAlive(pid)) {
+export function classifyLockHolderProcess(pid, dependencies = {}) {
+    const isProcessAlive = dependencies.isPidAlive ?? isPidAlive;
+    const getProcessRecord = dependencies.getProcessRecordByPid ?? getProcessRecordByPid;
+    if (!isProcessAlive(pid)) {
         return "unknown";
     }
-    const record = getProcessRecordByPid(pid);
+    const record = getProcessRecord(pid);
     if (!record) {
         return "unknown";
     }
@@ -200,6 +211,7 @@ export class BridgeStateStore {
             cwd: options.cwd,
             startedAt: new Date(this.bridgeStartedAtMs).toISOString(),
             lifecycle: options.lifecycle,
+            channelId: options.channelId,
         };
         this.acquireLock();
         const shouldRestoreSessionState = options.sessionStartMode !== "new";
@@ -231,6 +243,7 @@ export class BridgeStateStore {
             resumeConversationId: persistedResumeConversationId,
             transcriptPath: persistedTranscriptPath,
             lastActivityAt: persisted?.lastActivityAt,
+            channelId: options.channelId,
             pendingConfirmation: null,
             pendingUserInput: null,
         };