@cubeai/dsh-feishu-channels 0.2.0 → 0.2.3

package/src/manager.js

@@ -26,7 +26,7 @@ function normalizeSendMode(input) {
     return input === 'steer' ? 'steer' : 'queue';
 }
 function channelAutoPrefix(platform) {
-    return `${CHANNEL_META[platform].label}账号`;
+    return `${CHANNEL_META[platform].label}频道`;
 }
 function parseAutoOrdinal(platform, name) {
     const trimmed = String(name ?? '').trim();
@@ -143,7 +143,8 @@ export class ChannelManager {
         this.applyAssistant(this.store.assistant);
         this.applyWorkspace(this.store.cwd);
         this.applyPermission(this.store.permission);
-        this.migrateAccountSettings();
+        if (this.migrateAccountSettings())
+            this.flush();
         const seen = new SeenStore(join(options.stateDir, 'seen.json'));
         const credentials = options.ctx.credentials;
         this.vault = credentials
@@ -223,7 +224,6 @@ export class ChannelManager {
             nameOrdinal,
             appId: typeof config.appId === 'string' ? config.appId : '',
             hasAppSecret: Boolean(config.appSecretRef || config.appSecret),
-            provisioning: config.provisioning,
             connected,
             connectionState: runtimeState,
             receiveConfigured: state.receiveEnabled !== false,
@@ -305,10 +305,9 @@ export class ChannelManager {
                         }),
                         timeout,
                     ]);
-                    const current = this.store.channels[accountId];
-                    if (current) {
-                        current.config = { ...(current.config ?? {}), provisioning };
-                        this.flush();
+                    const provisioningErrors = Array.isArray(provisioning?.errors) ? provisioning.errors : [];
+                    if (provisioningErrors.length > 0) {
+                        this.log(`[manager] 应用配置初始化未完成: ${provisioningErrors.map((item) => item?.message ?? item?.step ?? 'unknown').join('; ')}`);
                     }
                 }
             }
@@ -323,13 +322,13 @@ export class ChannelManager {
         }
         catch (error) {
             this.log(`[manager] ${id} 连接失败: ${error instanceof Error ? error.message : String(error)}`);
-            return { ok: false, error: '账号连接失败，请查看本机日志', accountId, created: !existed, newIdentity: hadAnotherIdentity };
+            return { ok: false, error: '频道连接失败，请查看本机日志', accountId, created: !existed, newIdentity: hadAnotherIdentity };
         }
     }
     async setReceive(id, receiveEnabled) {
         const accountId = this.resolveAccountId(id);
         if (!accountId)
-            return { ok: false, error: '账号不存在' };
+            return { ok: false, error: '频道不存在' };
         return this.channelOperations.run(accountId, () => this.setReceiveNow(accountId, receiveEnabled));
     }
     async setReceiveNow(id, receiveEnabled) {
@@ -571,7 +570,7 @@ export class ChannelManager {
                         }
                         const accountId = this.resolveAccountId(id);
                         if (!accountId) {
-                            send(404, { ok: false, error: '账号不存在或该渠道包含多个账号' });
+                            send(404, { ok: false, error: '频道不存在或该渠道包含多个频道' });
                             return;
                         }
                         if (action === 'approve')
@@ -589,7 +588,7 @@ export class ChannelManager {
                     const action = parts[4];
                     const body = await readBody();
                     if (!this.store.channels[accountId]) {
-                        send(404, { ok: false, error: '账号不存在' });
+                        send(404, { ok: false, error: '频道不存在' });
                         return;
                     }
                     if (action === 'settings') {
@@ -622,8 +621,6 @@ export class ChannelManager {
                             name: state.name,
                             log: this.log,
                         });
-                        state.config = { ...(state.config ?? {}), provisioning };
-                        this.flush();
                         send(200, { ok: true, account: this.accountView(accountId, state), provisioning });
                         return;
                     }
@@ -657,7 +654,7 @@ export class ChannelManager {
                         send(200, { ok: true, pending: this.pendingRequests() });
                         return;
                     }
-                    send(404, { ok: false, error: `未知账号操作 ${action}` });
+                    send(404, { ok: false, error: `未知频道操作 ${action}` });
                     return;
                 }
                 send(404, { ok: false, error: 'not found' });
@@ -729,11 +726,11 @@ export class ChannelManager {
     }
     async updateAccount(accountId, input) {
         if (!this.store.channels[accountId])
-            return { ok: false, error: '账号不存在' };
+            return { ok: false, error: '频道不存在' };
         return this.channelOperations.run(accountId, async () => {
             const state = this.store.channels[accountId];
             if (!state)
-                return { ok: false, error: '账号不存在' };
+                return { ok: false, error: '频道不存在' };
             const platform = this.platformOf(accountId, state);
             const normalized = await this.normalizeAccountSettings(platform, input, state);
             if (!normalized.ok)
@@ -774,7 +771,7 @@ export class ChannelManager {
         const job = this.channelOperations.run(accountId, async () => {
             const state = this.store.channels[accountId];
             if (!state)
-                return { ok: false, error: '账号不存在' };
+                return { ok: false, error: '频道不存在' };
             if (this.disposed)
                 return { ok: false, error: '操作失败，请查看本机日志' };
             const signal = AbortSignal.any([AbortSignal.timeout(12_000), this.diagnosticAbort.signal]);
@@ -824,7 +821,7 @@ export class ChannelManager {
     }
     async reconnect(accountId) {
         if (!this.store.channels[accountId])
-            return { ok: false, error: '账号不存在' };
+            return { ok: false, error: '频道不存在' };
         return this.channelOperations.run(accountId, async () => {
             try {
                 const state = this.store.channels[accountId];
@@ -835,7 +832,7 @@ export class ChannelManager {
             }
             catch (error) {
                 this.log(`[manager] 重新连接 ${accountId} 失败: ${error instanceof Error ? error.message : String(error)}`);
-                return { ok: false, error: '重新连接失败，请查看本机日志' };
+                return { ok: false, error: '重新连接频道失败，请查看本机日志' };
             }
         });
     }
@@ -980,7 +977,7 @@ export class ChannelManager {
             return;
         const state = this.store.channels[id];
         if (!state)
-            throw new Error('账号不存在');
+            throw new Error('频道不存在');
         const platform = this.platformOf(id, state);
         const resolved = await this.resolveSecrets(platform, id, state.config ?? {});
         if (this.disposed)
@@ -993,7 +990,7 @@ export class ChannelManager {
         try {
             adapter = createChannelAdapter(platform, resolved, this.log, accountDir, {
                 accountId: id,
-                accountLabel: state.name || `${CHANNEL_META[platform].label}账号`,
+                accountLabel: state.name || `${CHANNEL_META[platform].label}频道`,
                 host: this.ctx,
             });
             if (!adapter)
@@ -1104,11 +1101,18 @@ export class ChannelManager {
         const assistant = this.currentAssistant() ?? { provider: this.engineConfig.provider, model: this.engineConfig.model };
         const cwd = this.currentWorkspace();
         const permission = this.currentPermission();
+        let removedProvisioning = false;
         for (const [id, state] of Object.entries(this.store.channels)) {
             const platform = this.platformOf(id, state);
             state.id = id;
             state.platform = platform;
-            state.name = String(state.name || `${CHANNEL_META[platform].label}账号`).trim();
+            state.name = String(state.name || `${CHANNEL_META[platform].label}频道`).trim();
+            if (state.config && typeof state.config === 'object' && Object.prototype.hasOwnProperty.call(state.config, 'provisioning')) {
+                const nextConfig = { ...state.config };
+                delete nextConfig.provisioning;
+                state.config = nextConfig;
+                removedProvisioning = true;
+            }
             state.assistant = normalizeAssistantModel(state.assistant ?? {}) ?? assistant;
             state.cwd = normalizeWorkspacePath(state.cwd) ?? cwd;
             state.permission = normalizePermission(state.permission, this.permissionPresets().names) ?? permission;
@@ -1116,6 +1120,7 @@ export class ChannelManager {
             state.sendMode = normalizeSendMode(state.sendMode);
         }
         this.store.version = 2;
+        return removedProvisioning;
     }
     async clearUnsupportedReasoningEfforts() {
         const llm = this.ctx.get?.('llm');
@@ -1197,9 +1202,9 @@ export class ChannelManager {
         const requested = input.name !== undefined ? String(input.name) : String(previous.name ?? '');
         const trimmed = requested.trim();
         if ([...trimmed].length > ACCOUNT_REMARK_LIMIT)
-            return { ok: false, error: `账号备注不能超过 ${ACCOUNT_REMARK_LIMIT} 个字符` };
+            return { ok: false, error: `频道名称不能超过 ${ACCOUNT_REMARK_LIMIT} 个字符` };
         if (/[\u0000-\u001F\u007F]/.test(trimmed))
-            return { ok: false, error: '账号备注不能包含换行或控制字符' };
+            return { ok: false, error: '频道名称不能包含换行或控制字符' };
         const name = trimmed || autoAccountName(platform, nameOrdinal);
         return { ok: true, settings: { name, nameOrdinal, assistant, agentPreset, cwd, permission, privateAccess, sendMode, commandPermissions } };
     }

package/docs/coexistence.md

@@ -1,112 +0,0 @@
-# Sidebar coexistence with dsh-im-connect
-
-This document is the maintenance contract for the shared "任务 | 频道 | 飞书频道" tab bar.
-
-## Why a contract is needed
-
-DSH has no official sidebar-tab slot. `sidebar.workspaces` is a single slot owned by
-`@deepseek-ai/dsh-client-ui-workspace`. `dsh-im-connect` wraps that component and
-attaches a private **Registry v1** (`component.__dshNativeTabs`). Other plugins can insert
-tabs into that registry without modifying `dsh-im-connect`.
-
-`@cubeai/dsh-feishu-channels` implements the same registry contract. Either plugin may be
-the wrapper ("host"); the other one inserts its tab.
-
-## Registry v1
-
-```ts
-interface SidebarTabRegistryV1 {
-  version: 1
-  officialTree: React.ComponentType<any>
-  sessionFilters: Array<(sessionId: string) => boolean>
-  sessionOpeners: Array<{ id: string, order?: number, matchSession(id: string): boolean, open(id: string, hostOpen?: (id: string) => void): void }>
-  getTabs(): Tab[]
-  getRevision(): number
-  subscribe(listener: () => void): () => void
-  insert(tab: Tab): () => void
-  addSessionFilter(filter: (id: string) => boolean): () => void
-  addSessionOpener(opener: SessionOpener): () => void
-}
-```
-
-Discovery rules (compatible with `dsh-im-connect@1.0.12`):
-
-1. Read `sidebar.workspaces` occupants.
-2. If `occupant.component.__dshNativeTabs` is a valid v1 registry, insert a tab; do not wrap.
-3. Else if the component is already wrapped by an unknown host, leave it untouched.
-4. Else wrap the official component and attach a registry to the wrapper function.
-
-Wrapper markers:
-
-- `__dshNativeTabHost = true`
-- `__dshNativeTabWrapped = true`
-- `__dshNativeTabOriginal = originalComponent`
-- `__dshNativeTabOwner = 'im-connect' | 'feishu-channel'`
-- `__dfcTabHost = true` (new plugin only)
-
-Coordination event: `window.dispatchEvent(new Event('dsh-native-sidebar-change'))`.
-
-## Tabs
-
-| Plugin | id | order | Label |
-|---|---|---:|---|
-| dsh-im-connect | `channels` | 20 | 频道 / Channels |
-| dsh-feishu-channels | `feishu` | 30 | 飞书频道 / Feishu |
-
-Tasks is the fixed first tab. Sorted result:
-
-```text
-任务 | 频道 | 飞书频道
-```
-
-When only one plugin is installed, the other tab is absent.
-
-## Session visibility
-
-- Feishu sessions use `dfc:`; im-connect sessions use `im:`.
-- Each plugin adds a session filter to the shared registry so its own sessions do not appear
-  in the Tasks tree.
-- A session id never matches both prefixes.
-- Do not share `sessions.json`, `channels.json`, credentials, or state directories.
-
-## Lifecycle
-
-| Event | Behavior |
-|---|---|
-| New plugin loads after im-connect | Insert `feishu` into im-connect's registry |
-| im-connect loads after new plugin | im-connect detects the new registry and inserts `channels` |
-| New plugin unloads, im-connect remains | Remove own tab/filter; if own wrapper, restore official component and dispatch change event; im-connect re-wraps |
-| im-connect unloads, new plugin remains | im-connect removes its tab/restores; new plugin re-wraps on change event |
-| Both disabled | Official sidebar |
-| Page refresh | Deterministic re-evaluation from the bundle order |
-
-All disposers must be idempotent and remove only their own tab/filter/opener.
-
-## Known limitations
-
-- Registry v1 is a private convention, not a DSH public API. A future im-connect release may
-  change it; the new plugin degrades to the official sidebar rather than fighting it.
-- Codex UI sidebars (`sidebar.channels`) are not wrapped by v1.
-- Two plugins must not use the same Feishu App ID at the same time; Feishu long-connection
-  events are delivered to one connection.
-- **Uninstall order:** because both plugins share the single `sidebar.workspaces` slot and
-  one wraps the other, uninstalling `dsh-im-connect` while the new plugin is active can be
-  rejected by DSH's `bundle-in-use` guard. Disable `@cubeai/dsh-feishu-channels` first, then
-  uninstall `dsh-im-connect`; the new plugin can be re-enabled afterwards (it falls back to
-  the official sidebar and shows `任务 | 飞书频道`). This is a UI-wrapper/runtime coupling,
-  not an npm dependency: neither package imports the other, and their Host state, APIs,
-  credentials, and sessions are separate.
-
-## Verification matrix
-
-| Scenario | Expected |
-|---|---|
-| new plugin only | 任务 \| 飞书频道 |
-| im-connect only | 任务 \| 频道 |
-| im-connect first, new plugin second | 任务 \| 频道 \| 飞书频道 |
-| new plugin first, im-connect second | 任务 \| 频道 \| 飞书频道 |
-| disable new plugin | 任务 \| 频道 |
-| disable im-connect | 任务 \| 飞书频道 |
-| uninstall either | Disable the other plugin first if DSH reports `bundle-in-use`; then uninstall, then re-enable |
-| refresh | Same as before refresh |
-| reload client | No duplicate tabs |