@dsh-enhanced/coding-subscription-provider 0.1.3 → 0.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +14 -14
- package/cordis.patch.yml +2 -0
- package/lib/adapter.d.ts +17 -3
- package/lib/adapter.d.ts.map +1 -1
- package/lib/adapter.js +101 -20
- package/lib/adapter.js.map +1 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +4 -2
- package/lib/index.js.map +1 -1
- package/lib/session-cwd.d.ts +4 -2
- package/lib/session-cwd.d.ts.map +1 -1
- package/lib/session-cwd.js +6 -3
- package/lib/session-cwd.js.map +1 -1
- package/lib/version.d.ts +1 -1
- package/lib/version.js +1 -1
- package/package.json +16 -2
package/README.md
CHANGED
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
| `cursor-subscription` | `cursor-agent` | beta | `default` |
|
|
14
14
|
| `grok-subscription` | `grok` | beta | `default` |
|
|
15
15
|
|
|
16
|
-
在默认 CLI 模式中,`default` 不会传 `--model`,因此保留官方 CLI
|
|
16
|
+
在默认 CLI 模式中,`default` 不会传 `--model`,因此保留官方 CLI 当前选择。模型选择器首次调用 `listModels` 或 5 分钟缓存过期时,会先执行已有订阅认证门禁,再从配置的 `cwd` 发起一次无 prompt、有界、只读的目录刷新;并发列表请求会共用同一次刷新。刷新成功后返回静态别名与完整动态目录,失败则安全降级到 `models` 中的静态项并记录无凭据诊断。`resolveModel` 仍只读取配置与有效内存缓存,不启动进程。不需要把每个模型手写进配置;目录是提示性的发现信息,不会阻止用户配置新模型,最终可用性仍由官方 CLI 校验。Codex direct 模式不启动 App Server、也不发现动态目录;其中 `default` 会明确映射到 `codex.directModel`。
|
|
17
17
|
|
|
18
18
|
安全默认值只启用 Codex 与 Cursor。Claude 因第三方分发政策边界默认关闭;Grok 因本地 per-model API Key 可覆盖 OAuth,默认关闭并要求用户先核验后显式确认。四条 connector 都包含在插件中。
|
|
19
19
|
|
|
@@ -23,9 +23,9 @@
|
|
|
23
23
|
|
|
24
24
|
1. **登录官方 CLI**(在运行 DSH 的同一 OS 用户下):`codex login status` 应输出 `Logged in using ChatGPT`。没登录就先 `codex login`。
|
|
25
25
|
2. **安装插件**:`dsh plugin --profile web add @dsh-enhanced/coding-subscription-provider`。
|
|
26
|
-
3. **确认命令与工作目录**:`codex --version`。命令名不同就在 `~/.dsh/profiles/web/cordis.patch.yml` 里把 `codex.command`
|
|
26
|
+
3. **确认命令与工作目录**:`codex --version`。命令名不同就在 `~/.dsh/profiles/web/cordis.patch.yml` 里把 `codex.command` 改成实际路径。bundle 的 `cwd` 默认与标准 Delivery 一样指向 `$DSH_HOME/assistant-workspace`;Codex CLI 要求它是 Git 仓库。若改到其他仓库,必须同时把 Delivery `defaultWorkspace` 改到同一 realpath(相对路径按 DSH 进程启动目录解析)。
|
|
27
27
|
4. **开启并落盘配置**:在配置中保持 `codex.enabled: true`(默认已开),执行 `dsh --profile web --dump-config` 检查生效值。
|
|
28
|
-
5. **选择模型与 effort
|
|
28
|
+
5. **选择模型与 effort**:打开模型选择器时,`listModels` 会先通过认证门禁并进行无 prompt 目录刷新,随后合并当前模型及 reasoning effort;若刷新失败仍可选择配置中的 `default`。目录刷新不创建 thread/session/turn,也不提交用户消息;真实生成调用才会消耗你的订阅推理额度。
|
|
29
29
|
|
|
30
30
|
Claude / Grok 默认关闭,启用前请阅读下文「订阅认证优先」与「Claude 合规提示」。遇到报错先看下文「排查」表。
|
|
31
31
|
|
|
@@ -60,7 +60,7 @@ dsh --profile web --dump-config
|
|
|
60
60
|
- id: dsh-enhanced-coding-subscription-provider
|
|
61
61
|
name: '@dsh-enhanced/coding-subscription-provider'
|
|
62
62
|
config:
|
|
63
|
-
cwd:
|
|
63
|
+
cwd: !!js dshHomePath('assistant-workspace')
|
|
64
64
|
timeoutMs: 600000
|
|
65
65
|
authProbeTimeoutMs: 10000
|
|
66
66
|
maxAuthProbeBytes: 32768
|
|
@@ -118,17 +118,17 @@ codex:
|
|
|
118
118
|
- `codex.directModel` 是 direct 模式选择 `default` 时发送给后端的具体模型 id;显式选择其他模型时仍使用所选 id。这个默认值只是本插件的实验性配置,不代表私有后端长期保证该模型可用。
|
|
119
119
|
- `codex.directReasoningEfforts` 是 direct route 向 DSH 暴露的可选 effort 列表,`codex.directDefaultReasoningEffort` 是调用未指定 effort 时由 DSH 物化的默认值,并且必须属于前一列表。当前默认暴露 `low` 到 `ultra`;私有 wire 会按官方 Codex 当前行为把 `ultra` 规范化为 `max`,这同样不是稳定承诺。
|
|
120
120
|
- `codex.maxRequestBytes` 限制序列化后的完整 direct 请求(包括 base64 图片),`codex.maxRequestImageBytes` 限制请求内累计图片负载,且后者不能大于前者。默认分别为 32 MiB 与 24 MiB;两项只影响 direct 模式。
|
|
121
|
-
- `cwd` 是 CLI 子进程允许使用的工作目录,也是 direct 模式的本地 session
|
|
122
|
-
- `listModels`
|
|
121
|
+
- `cwd` 是 CLI 子进程允许使用的工作目录,也是 direct 模式的本地 session 授权边界;bundle 默认使用 `$DSH_HOME/assistant-workspace`,与标准 Delivery 默认值一致。相对路径按 DSH 进程启动目录解析,不是按 Web 会话显示的项目目录解析。对每个**带 prompt 的普通对话调用**,插件要求深冻结的 DSH Agent Loop 请求;当模块 marker 因源码 link 或 adapter 克隆不可见时,Host `agents` 服务还会核对仍在运行的精确 Agent、registry/session 对象身份,并从 live Session header/messages 重建请求,只容许 rc.8 `forAdapter()` 删除跨 route `replayState`。随后对 live session cwd 与配置 cwd 做 `realpath` 并要求完全相等。缺失、过期、伪造、辅助/嵌套调用、请求变形、路径不匹配或 symlink escape 都会在认证、网络请求或 CLI 启动前以 `LOCAL_SESSION_CWD_REQUIRED` 拒绝;CLI 模式收到的是该 canonical session cwd。Cordis `config` 是整段替换,覆盖时必须保留 `cwd`;若改目录,还要同步修改 Delivery `defaultWorkspace`。Codex `exec` 要求这里是 Git 仓库;插件不会静默追加 `--skip-git-repo-check` 绕过该检查。修改后需重启 DSH。
|
|
122
|
+
- CLI transport 的 `listModels` 在目录缓存冷启动或 5 分钟过期时,会使用配置的 `cwd` 先执行已有认证门禁,再启动一次无 prompt、有界的只读目录探针;它不需要 live session identity,也不会创建生成 turn。相同 provider 的并发请求共享一次 in-flight 刷新;失败只返回配置中的静态 `models` 并记录无凭据分类诊断。生成调用从不触发或等待目录刷新,只执行自身认证和两次 live-session cwd 校验。`resolveModel` 始终是纯缓存/配置读取,不执行认证、目录发现或子进程。Codex `direct-responses` 的 `listModels` 同样保持纯静态且不启动 CLI/App Server。
|
|
123
123
|
- `timeoutMs` 是单次调用总时限;取消或超时先发 `SIGINT`,经过 `killGraceMs` 再发 `SIGKILL`,再等待一个等长窗口确认 `close`。仍未关闭时请求以 `teardown=timed-out` 错误结算,保留原始 abort/timeout 分类,并在后台继续引流并跟踪迟到的 `close`;不会伪称子进程已回收。
|
|
124
|
-
- `authProbeTimeoutMs` / `maxAuthProbeBytes` 限制 CLI
|
|
124
|
+
- `authProbeTimeoutMs` / `maxAuthProbeBytes` 限制 CLI 模式中 `listModels` 与生成调用使用的认证状态检查,以及 `listModels` 的无 prompt 模型目录发现;Codex 目录还受 `killGraceMs`、`maxLineBytes`、`maxOutputBytes`、`maxStderrBytes` 约束。探针输出不会进入模型响应。Codex direct 请求使用总调用的 `timeoutMs`,不运行这些 CLI 探针。
|
|
125
125
|
- 三项输出限制和 prompt 限制都按 UTF-8 字节计算。
|
|
126
126
|
- `maxTurns` 目前只映射到 Claude Code 和 Grok Build;Codex/Cursor 不会收到它们不支持的参数。
|
|
127
|
-
- `models`
|
|
127
|
+
- `models` 是目录探针不可用时仍可展示的静态别名列表;CLI route 会在 `listModels` 的安全刷新后合并动态条目,Codex direct 模式只使用静态别名。通常保留 `[default]` 即可。
|
|
128
128
|
- 启用 Grok 前先通过 browser/device flow 完成 `grok login`,确认 `grok models` 报告已登录,再用 `grok inspect` 确认所选模型没有 `api_key` / `env_key` override;随后同时设置 `enabled: true` 与 `userVerifiedSubscription: true`。`inspect` 本身不报告 active credential,该确认是本机用户的显式声明,不是插件读取凭据后的推断。
|
|
129
129
|
- `command` 是单个命令名或路径,CLI 模式固定参数数组并使用 `shell: false`,不接受 shell 片段;Codex direct 模式不使用该字段。
|
|
130
130
|
- `extraEnvNames` 只填写要额外继承的环境变量名,值只能来自启动 DSH 的环境,配置中不能直接写 secret。
|
|
131
|
-
-
|
|
131
|
+
- 目录探针的 stderr 始终只生成固定的无凭据提示,原文不会传给诊断 sink。其他 CLI 的 stderr 在 adapter 诊断边界先经过常见 key/token/邮箱规则脱敏;`logDiagnostics` 默认仍只提示“CLI 写入了 stderr”,显式开启后才记录脱敏后的末尾 2,000 字符,仍不适合高敏感环境。独立于该开关,插件始终会在每次调用结算时记录一条**无凭据**的生命周期诊断(阶段、prompt 是否提交、结果分类、teardown 状态、exit/signal,以及能可靠测得的毫秒级延迟指标),成功走 `debug`、非成功走 `info`。该行不含 prompt、argv、stderr 原文或认证凭据。
|
|
132
132
|
|
|
133
133
|
加载后,在 DSH 的 provider/model 选择处选择上表中的 provider 和模型即可。真实订阅调用会消耗额度,自动化测试不会使用真实账号。
|
|
134
134
|
|
|
@@ -174,13 +174,13 @@ XAI_API_KEY
|
|
|
174
174
|
|
|
175
175
|
| 能力 | 行为 |
|
|
176
176
|
|---|---|
|
|
177
|
-
| 文件系统 | CLI 模式把经过 live-loop session 身份和 canonical `realpath` 精确校验的 cwd
|
|
177
|
+
| 文件系统 | CLI 模式把经过 live-loop session 身份和 canonical `realpath` 精确校验的 cwd 交给带 prompt 的外部 CLI;`listModels` 的无 prompt 认证/目录探针使用配置的 `cwd`,不创建 turn,`resolveModel` 不启动进程。Codex CLI 使用 read-only sandbox;Claude 禁用内置 tools;Grok 1.0.5 使用 allowlist + denylist 形成空生成工具集;Cursor/Grok 的最终强度仍取决于客户端版本、用户配置和 OS 隔离。Codex direct 不把 cwd 交给模型进程,但会读取并可能以 CAS + 原子替换更新 `CODEX_HOME/auth.json` 或 `~/.codex/auth.json`;与不使用同一 CAS 的外部写者并发时只能 best-effort 避免覆盖。图片字节只通过宿主提供的 attachment service 读取。 |
|
|
178
178
|
| 网络 | CLI 模式下插件本身不请求模型端点,官方 CLI 会连接各自的登录、推理、更新或遥测服务。Codex direct 由插件固定请求 `https://chatgpt.com/backend-api/codex/responses`,仅在 401 刷新时请求 `https://auth.openai.com/oauth/token`;不能把凭据用于任意 URL。请求正文会把对话、tool schema/tool result,以及可用时的图片发送给该私有后端。 |
|
|
179
|
-
| 子进程 | CLI 模式仅直接启动配置的单个可执行文件,`shell: false
|
|
179
|
+
| 子进程 | CLI 模式仅直接启动配置的单个可执行文件,`shell: false`;冷启动或过期的 `listModels` 会在认证通过后短暂启动同一可执行文件的 App Server、SDK/ACP 初始化或列表模式,且不会提交 prompt 或创建生成 turn。POSIX 上为生成调用建立进程组并整体取消;Windows 只能 best-effort 终止直接子进程。官方 CLI 仍可能自行创建脱离进程组的后代。`resolveModel` 和 Codex direct 的模型列表不启动 Codex CLI 或 App Server。 |
|
|
180
180
|
| 凭据 | CLI 模式不读取官方 auth 文件、不实现 OAuth,由官方客户端访问凭据。Codex direct 会按上述 POSIX 文件约束直接读取 ChatGPT session,在 401 时至多刷新一次,并以插件自身的 CAS + 原子替换流程写回;它不接受 API key fallback,也不把 token 写入响应或日志。 |
|
|
181
181
|
| 浏览器 | 插件不会打开浏览器;用户单独执行官方 login 时可能打开。 |
|
|
182
182
|
| 安装脚本 | 本 npm 包没有 install/postinstall 脚本,也不会安装或更新四个官方 CLI。 |
|
|
183
|
-
| 日志 | stderr
|
|
183
|
+
| 日志 | stderr 有界且默认不记录内容;目录探针的 stderr 原文永不传给诊断 sink,只报告固定无凭据提示。其他 CLI 选择 `logDiagnostics` 后会脱敏常见 key、Bearer token 和邮箱,但无法识别任意业务秘密;插件本身不主动记录 prompt。每次调用结算记录一条无凭据生命周期诊断(阶段/提交状态/结果分类/teardown/exit/signal,以及可测得的毫秒级延迟指标),不含 prompt、argv、stderr 原文或认证凭据。 |
|
|
184
184
|
|
|
185
185
|
CLI 模式的任务正文作为独立 argv 元素传给官方 CLI。它不会经过 shell,但仍受操作系统命令行长度限制,并且在某些系统上可能被同机高权限用户通过进程列表看到;敏感、多用户主机应增加 OS 级隔离。默认 prompt 上限因此保守设为 128 KiB。Codex direct 不把 prompt 放进进程 argv,而是受独立的 `codex.maxRequestBytes` 限制。
|
|
186
186
|
|
|
@@ -243,7 +243,7 @@ Anthropic 的技术文档允许 `claude -p` 使用订阅登录,但其法律与
|
|
|
243
243
|
## 兼容性与调研
|
|
244
244
|
|
|
245
245
|
- Node.js `^22.19.0 || >=24.0.0`
|
|
246
|
-
- DeepSeek Harness / `@deepseek-ai/dsh-llm` `>=0.1.0-rc.8 <0.2.0`
|
|
246
|
+
- DeepSeek Harness / `@deepseek-ai/dsh-agent` / `@deepseek-ai/dsh-llm` / `@deepseek-ai/dsh-session` `>=0.1.0-rc.8 <0.2.0`
|
|
247
247
|
- Cordis `^4.0.1`
|
|
248
248
|
- Codex CLI `0.147.0`(已验证;模型目录基于官方 [Codex App Server](https://developers.openai.com/codex/app-server) 的 `model/list`)
|
|
249
249
|
- Codex `direct-responses`(实验性私有协议;不是 OpenAI 面向第三方承诺的公开 API,兼容基线见 [compatibility.md](../../docs/compatibility.md))
|
|
@@ -252,4 +252,4 @@ Anthropic 的技术文档允许 `claude -p` 使用订阅登录,但其法律与
|
|
|
252
252
|
- Grok Build `1.0.5`(已验证;目录与 effort 来自 ACP `initialize` 的 `modelState`,生成事件遵循官方 [headless `streaming-json`](https://github.com/xai-org/grok-build/blob/main/crates/codegen/xai-grok-pager/docs/user-guide/14-headless-mode.md#streaming-json))
|
|
253
253
|
- Cursor CLI:目录使用官方 [`--list-models`](https://cursor.com/changelog/cli-jan-08-2026);本机未安装,依赖 fixture 验证
|
|
254
254
|
|
|
255
|
-
|
|
255
|
+
进一步阅读:[Codex 路由调研](../../docs/grok-bot-codex-router-research.md)、[插件生态与 Hermes/OpenClaw 对比](../../docs/dsh-personal-assistant-plugin-landscape.md)、[兼容基线](../../docs/compatibility.md)。
|
package/cordis.patch.yml
CHANGED
package/lib/adapter.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { LlmAdapter, type GenerateOptions, type LlmModelInfo, type LlmProviderInfo, type LlmResolvedModelInfo, type ResolvedRetryPolicy, type StreamChunk } from '@deepseek-ai/dsh-llm';
|
|
2
|
+
import type { AgentLoopRequestAttestor } from '@dsh-enhanced/llm-route-capabilities';
|
|
2
3
|
import { type SubscriptionAuthVerifier } from './auth.js';
|
|
3
4
|
import { type CodexCatalog, type CodexCatalogInvocation, type DiscoverCodexModelsOptions } from './codex-catalog.js';
|
|
4
5
|
import { CodexCredentialStore } from './codex-direct-auth.js';
|
|
@@ -52,6 +53,10 @@ export interface AdapterDependencies {
|
|
|
52
53
|
onSettled?: (context: RouteFailureContext) => void;
|
|
53
54
|
/** Host-owned live session lookup used to bind local process cwd to a loop request. */
|
|
54
55
|
liveSessions?: LiveSessionLookup;
|
|
56
|
+
/** Scoped Host proof retained when LlmRuntime creates a legitimate adapter request clone. */
|
|
57
|
+
requestAttestor?: AgentLoopRequestAttestor;
|
|
58
|
+
/** Injectable monotonic-enough wall clock for deterministic catalog-cache tests. */
|
|
59
|
+
now?: () => number;
|
|
55
60
|
}
|
|
56
61
|
export declare const CODEX_DIRECT_PROVIDER_HTTP_CODE = "CODEX_DIRECT_PROVIDER_HTTP";
|
|
57
62
|
export declare const CODEX_DIRECT_PROVIDER_FAILURE_CODE = "CODEX_DIRECT_PROVIDER_FAILURE";
|
|
@@ -75,9 +80,12 @@ export declare class CodingSubscriptionAdapter extends LlmAdapter {
|
|
|
75
80
|
private readonly onDiagnostic;
|
|
76
81
|
private readonly onSettled;
|
|
77
82
|
private readonly liveSessions;
|
|
83
|
+
private readonly requestAttestor;
|
|
84
|
+
private readonly now;
|
|
78
85
|
private readonly lifecycle;
|
|
79
86
|
private codexCatalogCache;
|
|
80
87
|
private readonly subscriptionCatalogCache;
|
|
88
|
+
private readonly catalogRefreshes;
|
|
81
89
|
constructor(config: CodingSubscriptionProviderConfig, dependencies?: AdapterDependencies);
|
|
82
90
|
private trustedCwd;
|
|
83
91
|
private reportSettled;
|
|
@@ -86,14 +94,20 @@ export declare class CodingSubscriptionAdapter extends LlmAdapter {
|
|
|
86
94
|
private peekCodexCatalog;
|
|
87
95
|
private peekSubscriptionCatalog;
|
|
88
96
|
/**
|
|
89
|
-
* Observe the advisory CLI catalog
|
|
90
|
-
*
|
|
91
|
-
* the session immediately before crossing this subprocess boundary.
|
|
97
|
+
* Observe the advisory Codex CLI catalog with bounded, prompt-free control-plane I/O.
|
|
98
|
+
* Authentication is owned by `refreshCatalog`; this method only performs discovery.
|
|
92
99
|
*/
|
|
93
100
|
private observeCodexCatalog;
|
|
94
101
|
private observeSubscriptionCatalog;
|
|
95
102
|
private observedCatalog;
|
|
96
103
|
private observeCatalog;
|
|
104
|
+
/**
|
|
105
|
+
* Refresh one CLI catalog after the existing subscription-auth gate. Concurrent
|
|
106
|
+
* list callers share the complete auth + discovery operation, so a cold picker
|
|
107
|
+
* cannot fan out local probes. Generation never enters or waits on this path.
|
|
108
|
+
*/
|
|
109
|
+
private refreshCatalog;
|
|
110
|
+
private reportCatalogRefreshFailure;
|
|
97
111
|
listModels(provider: string): Promise<readonly LlmModelInfo[]>;
|
|
98
112
|
resolveModel(provider: string, model: string, signal?: AbortSignal): Promise<LlmResolvedModelInfo>;
|
|
99
113
|
stream(options: GenerateOptions): AsyncIterable<StreamChunk>;
|
package/lib/adapter.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"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"}
|
package/lib/adapter.js
CHANGED
|
@@ -17,6 +17,7 @@ export const routeDefinitions = [
|
|
|
17
17
|
{ route: 'grok-subscription', cli: 'grok', name: 'Grok Subscription (local Grok Build)', maturity: 'beta' },
|
|
18
18
|
];
|
|
19
19
|
const CATALOG_TTL_MS = 5 * 60_000;
|
|
20
|
+
const CATALOG_STDERR_DIAGNOSTIC = 'model catalog probe wrote to stderr; content withheld';
|
|
20
21
|
const noAutomaticRetry = Object.freeze({
|
|
21
22
|
mode: 'normal',
|
|
22
23
|
maxRetries: 0,
|
|
@@ -205,9 +206,12 @@ export class CodingSubscriptionAdapter extends LlmAdapter {
|
|
|
205
206
|
onDiagnostic;
|
|
206
207
|
onSettled;
|
|
207
208
|
liveSessions;
|
|
209
|
+
requestAttestor;
|
|
210
|
+
now;
|
|
208
211
|
lifecycle = new AbortController();
|
|
209
212
|
codexCatalogCache;
|
|
210
213
|
subscriptionCatalogCache = new Map();
|
|
214
|
+
catalogRefreshes = new Map();
|
|
211
215
|
constructor(config, dependencies = {}) {
|
|
212
216
|
super();
|
|
213
217
|
this.config = config;
|
|
@@ -224,9 +228,16 @@ export class CodingSubscriptionAdapter extends LlmAdapter {
|
|
|
224
228
|
this.onDiagnostic = dependencies.onDiagnostic;
|
|
225
229
|
this.onSettled = dependencies.onSettled;
|
|
226
230
|
this.liveSessions = dependencies.liveSessions;
|
|
231
|
+
this.requestAttestor = dependencies.requestAttestor;
|
|
232
|
+
this.now = dependencies.now ?? Date.now;
|
|
227
233
|
}
|
|
228
234
|
trustedCwd(request) {
|
|
229
|
-
return resolveTrustedSessionCwd({
|
|
235
|
+
return resolveTrustedSessionCwd({
|
|
236
|
+
request,
|
|
237
|
+
configuredCwd: this.cwd,
|
|
238
|
+
sessions: this.liveSessions,
|
|
239
|
+
...(this.requestAttestor === undefined ? {} : { attestor: this.requestAttestor }),
|
|
240
|
+
});
|
|
230
241
|
}
|
|
231
242
|
reportSettled(context) {
|
|
232
243
|
if (this.onSettled === undefined)
|
|
@@ -252,22 +263,21 @@ export class CodingSubscriptionAdapter extends LlmAdapter {
|
|
|
252
263
|
}
|
|
253
264
|
peekCodexCatalog() {
|
|
254
265
|
const cached = this.codexCatalogCache;
|
|
255
|
-
if (cached !== undefined && cached.expiresAt >
|
|
266
|
+
if (cached !== undefined && cached.expiresAt > this.now())
|
|
256
267
|
return cached.catalog;
|
|
257
268
|
this.codexCatalogCache = undefined;
|
|
258
269
|
return undefined;
|
|
259
270
|
}
|
|
260
271
|
peekSubscriptionCatalog(provider) {
|
|
261
272
|
const cached = this.subscriptionCatalogCache.get(provider);
|
|
262
|
-
if (cached !== undefined && cached.expiresAt >
|
|
273
|
+
if (cached !== undefined && cached.expiresAt > this.now())
|
|
263
274
|
return cached.catalog;
|
|
264
275
|
this.subscriptionCatalogCache.delete(provider);
|
|
265
276
|
return undefined;
|
|
266
277
|
}
|
|
267
278
|
/**
|
|
268
|
-
* Observe the advisory CLI catalog
|
|
269
|
-
*
|
|
270
|
-
* the session immediately before crossing this subprocess boundary.
|
|
279
|
+
* Observe the advisory Codex CLI catalog with bounded, prompt-free control-plane I/O.
|
|
280
|
+
* Authentication is owned by `refreshCatalog`; this method only performs discovery.
|
|
271
281
|
*/
|
|
272
282
|
async observeCodexCatalog(cwd, signal) {
|
|
273
283
|
if (signal.aborted)
|
|
@@ -286,9 +296,18 @@ export class CodingSubscriptionAdapter extends LlmAdapter {
|
|
|
286
296
|
maxOutputBytes: this.config.maxOutputBytes,
|
|
287
297
|
maxStderrBytes: this.config.maxStderrBytes,
|
|
288
298
|
extraEnvNames: this.config.extraEnvNames,
|
|
289
|
-
onDiagnostic:
|
|
299
|
+
onDiagnostic: () => {
|
|
300
|
+
try {
|
|
301
|
+
this.onDiagnostic?.(definition.route, CATALOG_STDERR_DIAGNOSTIC);
|
|
302
|
+
}
|
|
303
|
+
catch {
|
|
304
|
+
// A diagnostic sink must never affect catalog discovery.
|
|
305
|
+
}
|
|
306
|
+
},
|
|
290
307
|
});
|
|
291
|
-
|
|
308
|
+
if (signal.aborted)
|
|
309
|
+
throw abortReason(signal);
|
|
310
|
+
this.codexCatalogCache = { catalog, expiresAt: this.now() + CATALOG_TTL_MS };
|
|
292
311
|
return catalog;
|
|
293
312
|
}
|
|
294
313
|
catch (error) {
|
|
@@ -315,7 +334,9 @@ export class CodingSubscriptionAdapter extends LlmAdapter {
|
|
|
315
334
|
maxOutputBytes: this.config.maxAuthProbeBytes,
|
|
316
335
|
extraEnvNames: this.config.extraEnvNames,
|
|
317
336
|
});
|
|
318
|
-
|
|
337
|
+
if (signal.aborted)
|
|
338
|
+
throw abortReason(signal);
|
|
339
|
+
this.subscriptionCatalogCache.set(provider, { catalog, expiresAt: this.now() + CATALOG_TTL_MS });
|
|
319
340
|
return catalog;
|
|
320
341
|
}
|
|
321
342
|
catch (error) {
|
|
@@ -333,11 +354,69 @@ export class CodingSubscriptionAdapter extends LlmAdapter {
|
|
|
333
354
|
? this.observeCodexCatalog(cwd, signal)
|
|
334
355
|
: this.observeSubscriptionCatalog(provider, cwd, signal);
|
|
335
356
|
}
|
|
357
|
+
/**
|
|
358
|
+
* Refresh one CLI catalog after the existing subscription-auth gate. Concurrent
|
|
359
|
+
* list callers share the complete auth + discovery operation, so a cold picker
|
|
360
|
+
* cannot fan out local probes. Generation never enters or waits on this path.
|
|
361
|
+
*/
|
|
362
|
+
refreshCatalog(provider, cwd) {
|
|
363
|
+
const refreshSignal = this.lifecycle.signal;
|
|
364
|
+
if (refreshSignal.aborted)
|
|
365
|
+
return Promise.reject(abortReason(refreshSignal));
|
|
366
|
+
const cached = this.observedCatalog(provider);
|
|
367
|
+
if (cached !== undefined)
|
|
368
|
+
return Promise.resolve(cached);
|
|
369
|
+
const active = this.catalogRefreshes.get(provider);
|
|
370
|
+
if (active !== undefined)
|
|
371
|
+
return active;
|
|
372
|
+
const profile = configForProvider(this.config, provider);
|
|
373
|
+
let refresh;
|
|
374
|
+
refresh = (async () => {
|
|
375
|
+
await this.verifyAuth(provider, {
|
|
376
|
+
command: profile.command,
|
|
377
|
+
cwd,
|
|
378
|
+
timeoutMs: this.config.authProbeTimeoutMs,
|
|
379
|
+
maxOutputBytes: this.config.maxAuthProbeBytes,
|
|
380
|
+
extraEnvNames: this.config.extraEnvNames,
|
|
381
|
+
signal: refreshSignal,
|
|
382
|
+
...(provider === 'grok'
|
|
383
|
+
? { userVerifiedSubscription: this.config.grok.userVerifiedSubscription }
|
|
384
|
+
: {}),
|
|
385
|
+
});
|
|
386
|
+
if (refreshSignal.aborted)
|
|
387
|
+
throw abortReason(refreshSignal);
|
|
388
|
+
return this.observeCatalog(provider, cwd, refreshSignal);
|
|
389
|
+
})().finally(() => {
|
|
390
|
+
if (this.catalogRefreshes.get(provider) === refresh)
|
|
391
|
+
this.catalogRefreshes.delete(provider);
|
|
392
|
+
});
|
|
393
|
+
this.catalogRefreshes.set(provider, refresh);
|
|
394
|
+
return refresh;
|
|
395
|
+
}
|
|
396
|
+
reportCatalogRefreshFailure(definition, error) {
|
|
397
|
+
if (this.lifecycle.signal.aborted)
|
|
398
|
+
return;
|
|
399
|
+
const diagnostic = `model catalog refresh failed; outcome=${outcomeFor(error)}; using configured models`;
|
|
400
|
+
try {
|
|
401
|
+
this.onDiagnostic?.(definition.route, diagnostic);
|
|
402
|
+
}
|
|
403
|
+
catch {
|
|
404
|
+
// A diagnostic sink must never turn advisory catalog failure into listModels failure.
|
|
405
|
+
}
|
|
406
|
+
}
|
|
336
407
|
async listModels(provider) {
|
|
337
408
|
const definition = definitionFor(provider);
|
|
338
409
|
const profile = configForProvider(this.config, definition.cli);
|
|
339
410
|
const directCodex = definition.cli === 'codex' && this.config.codex.transport === 'direct-responses';
|
|
340
|
-
|
|
411
|
+
let catalog;
|
|
412
|
+
if (!directCodex && !this.lifecycle.signal.aborted) {
|
|
413
|
+
try {
|
|
414
|
+
catalog = await this.refreshCatalog(definition.cli, this.cwd);
|
|
415
|
+
}
|
|
416
|
+
catch (error) {
|
|
417
|
+
this.reportCatalogRefreshFailure(definition, error);
|
|
418
|
+
}
|
|
419
|
+
}
|
|
341
420
|
const attachments = directCodex ? this.getAttachments() : undefined;
|
|
342
421
|
const inputModalities = directCodex && attachments !== undefined
|
|
343
422
|
? ['text', 'image']
|
|
@@ -451,11 +530,9 @@ export class CodingSubscriptionAdapter extends LlmAdapter {
|
|
|
451
530
|
if (directCodex) {
|
|
452
531
|
const timeoutSignal = AbortSignal.timeout(this.config.timeoutMs);
|
|
453
532
|
const directSignal = AbortSignal.any([signal, timeoutSignal]);
|
|
454
|
-
phase = 'stream';
|
|
455
533
|
try {
|
|
456
534
|
// Revalidate immediately before the first credential/file/network seam.
|
|
457
535
|
this.trustedCwd(options);
|
|
458
|
-
promptSubmissionState = 'unknown';
|
|
459
536
|
// `maxTokens` is a host-local Agent Loop budget. The private Codex
|
|
460
537
|
// request has no max_output_tokens field, so do not hand this hint to
|
|
461
538
|
// the direct runner (which deliberately rejects unsupported controls).
|
|
@@ -468,7 +545,11 @@ export class CodingSubscriptionAdapter extends LlmAdapter {
|
|
|
468
545
|
};
|
|
469
546
|
const attachments = this.getAttachments();
|
|
470
547
|
const chunks = this.runCodexDirect(directOptions, {
|
|
471
|
-
request: (body, requestSignal) =>
|
|
548
|
+
request: (body, requestSignal) => {
|
|
549
|
+
phase = 'stream';
|
|
550
|
+
promptSubmissionState = 'unknown';
|
|
551
|
+
return this.codexCredentials.requestResponses(body, requestSignal);
|
|
552
|
+
},
|
|
472
553
|
maxRequestBytes: this.config.codex.maxRequestBytes,
|
|
473
554
|
maxRequestImageBytes: this.config.codex.maxRequestImageBytes,
|
|
474
555
|
...(attachments === undefined ? {} : { attachments }),
|
|
@@ -540,13 +621,12 @@ export class CodingSubscriptionAdapter extends LlmAdapter {
|
|
|
540
621
|
outcome = outcomeFor(error);
|
|
541
622
|
throw cliFailure(definition, profile.command, error);
|
|
542
623
|
}
|
|
543
|
-
//
|
|
544
|
-
//
|
|
545
|
-
//
|
|
624
|
+
// Revalidate the authority boundary after auth so a stale/replaced session
|
|
625
|
+
// cannot reach the generation process. Catalog discovery belongs exclusively
|
|
626
|
+
// to listModels and never delays a generation request.
|
|
546
627
|
phase = 'preflight';
|
|
547
628
|
try {
|
|
548
629
|
cwd = this.trustedCwd(options);
|
|
549
|
-
await this.observeCatalog(definition.cli, cwd, signal);
|
|
550
630
|
}
|
|
551
631
|
catch (error) {
|
|
552
632
|
outcome = outcomeFor(error);
|
|
@@ -559,7 +639,7 @@ export class CodingSubscriptionAdapter extends LlmAdapter {
|
|
|
559
639
|
maxOutputBytes: this.config.maxOutputBytes,
|
|
560
640
|
maxStderrBytes: this.config.maxStderrBytes,
|
|
561
641
|
extraEnvNames: this.config.extraEnvNames,
|
|
562
|
-
onDiagnostic: diagnostic => this.onDiagnostic?.(definition.route, diagnostic),
|
|
642
|
+
onDiagnostic: diagnostic => this.onDiagnostic?.(definition.route, redactDiagnostic(diagnostic)),
|
|
563
643
|
onSettled: context => { transportContext = context; },
|
|
564
644
|
signal,
|
|
565
645
|
};
|
|
@@ -597,11 +677,12 @@ export class CodingSubscriptionAdapter extends LlmAdapter {
|
|
|
597
677
|
}
|
|
598
678
|
/** Abort every active/future subprocess when the owning Cordis fiber unloads. */
|
|
599
679
|
shutdown() {
|
|
600
|
-
this.codexCatalogCache = undefined;
|
|
601
|
-
this.subscriptionCatalogCache.clear();
|
|
602
680
|
if (!this.lifecycle.signal.aborted) {
|
|
603
681
|
this.lifecycle.abort(new Error('coding subscription provider unloaded', { cause: 'abort' }));
|
|
604
682
|
}
|
|
683
|
+
this.codexCatalogCache = undefined;
|
|
684
|
+
this.subscriptionCatalogCache.clear();
|
|
685
|
+
this.catalogRefreshes.clear();
|
|
605
686
|
}
|
|
606
687
|
}
|
|
607
688
|
export function enabledRoutes(config) {
|
package/lib/adapter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"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"}
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAElD,OAAO,EACL,yBAAyB,EAI1B,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,MAAM,EAAmB,KAAK,gCAAgC,EAAE,MAAM,aAAa,CAAA;AAE5F,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEtC,eAAO,MAAM,IAAI,8CAA8C,CAAA;AAC/D,eAAO,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAElD,OAAO,EACL,yBAAyB,EAI1B,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,MAAM,EAAmB,KAAK,gCAAgC,EAAE,MAAM,aAAa,CAAA;AAE5F,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEtC,eAAO,MAAM,IAAI,8CAA8C,CAAA;AAC/D,eAAO,MAAM,MAAM,UAAgC,CAAA;AAEnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,EAAE,OAAO,EAAE,CAAA;AACrD,YAAY,EAAE,gCAAgC,EAAE,CAAA;AAEhD,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,gCAAgC,GAAG,IAAI,CAwDlF"}
|
package/lib/index.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { registerLlmRouteCapability } from '@dsh-enhanced/llm-route-capabilities';
|
|
1
|
+
import { createAgentLoopRequestAttestor, registerLlmRouteCapability } from '@dsh-enhanced/llm-route-capabilities';
|
|
2
2
|
import { CodingSubscriptionAdapter, enabledRoutes, redactDiagnostic, } from './adapter.js';
|
|
3
3
|
import { Config, normalizeConfig } from './config.js';
|
|
4
4
|
import { version } from './version.js';
|
|
5
5
|
export const name = 'dsh-enhanced-coding-subscription-provider';
|
|
6
|
-
export const inject = ['llm', 'sessions'];
|
|
6
|
+
export const inject = ['llm', 'sessions', 'agents'];
|
|
7
7
|
export { CodingSubscriptionAdapter, Config, version };
|
|
8
8
|
export function apply(ctx, input) {
|
|
9
9
|
const config = normalizeConfig(input);
|
|
@@ -12,10 +12,12 @@ export function apply(ctx, input) {
|
|
|
12
12
|
ctx.logger.warn('dsh-enhanced-coding-subscription-provider: every provider is disabled');
|
|
13
13
|
return;
|
|
14
14
|
}
|
|
15
|
+
const requestAttestor = createAgentLoopRequestAttestor(ctx.agents, routes);
|
|
15
16
|
const adapter = new CodingSubscriptionAdapter(config, {
|
|
16
17
|
// A local CLI must only run for a live, loop-owned session. Do not derive
|
|
17
18
|
// this from model-visible request data or the configured provider cwd.
|
|
18
19
|
liveSessions: ctx.get('sessions'),
|
|
20
|
+
requestAttestor,
|
|
19
21
|
// Attachments are optional and may load/unload after this plugin. Resolve
|
|
20
22
|
// the service for each operation instead of retaining a stale instance.
|
|
21
23
|
getAttachments: () => ctx.get('attachments'),
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/lib/session-cwd.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type GenerateOptions } from '@deepseek-ai/dsh-llm';
|
|
2
|
+
import type { AgentLoopRequestAttestor } from '@dsh-enhanced/llm-route-capabilities';
|
|
2
3
|
export interface LiveSessionCwd {
|
|
3
4
|
readonly id: NonNullable<GenerateOptions['sessionId']>;
|
|
4
5
|
readonly header: {
|
|
@@ -13,12 +14,13 @@ export declare class TrustedSessionCwdError extends Error {
|
|
|
13
14
|
}
|
|
14
15
|
/**
|
|
15
16
|
* Resolves the only cwd a local coding process may receive for this request.
|
|
16
|
-
*
|
|
17
|
-
* fields or a persisted/stale session id cannot select
|
|
17
|
+
* A same-module marker or the Host-owned exact live-agent proof is mandatory;
|
|
18
|
+
* copied request fields or a persisted/stale session id cannot select a path.
|
|
18
19
|
*/
|
|
19
20
|
export declare function resolveTrustedSessionCwd(input: {
|
|
20
21
|
request: GenerateOptions;
|
|
21
22
|
configuredCwd: string;
|
|
22
23
|
sessions: LiveSessionLookup | undefined;
|
|
24
|
+
attestor?: AgentLoopRequestAttestor;
|
|
23
25
|
}): string;
|
|
24
26
|
//# sourceMappingURL=session-cwd.d.ts.map
|
package/lib/session-cwd.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-cwd.d.ts","sourceRoot":"","sources":["../src/session-cwd.ts"],"names":[],"mappings":"AAEA,OAAO,EAAsB,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"session-cwd.d.ts","sourceRoot":"","sources":["../src/session-cwd.ts"],"names":[],"mappings":"AAEA,OAAO,EAAsB,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC/E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAA;AAEpF,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,EAAE,WAAW,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAA;IACtD,QAAQ,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAC3C;AAED,MAAM,WAAW,iBAAiB;IAChC,GAAG,CAAC,EAAE,EAAE,WAAW,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,GAAG,cAAc,GAAG,SAAS,CAAA;CAC/E;AAED,qBAAa,sBAAuB,SAAQ,KAAK;;CAIhD;AAWD;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE;IAC9C,OAAO,EAAE,eAAe,CAAA;IACxB,aAAa,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,iBAAiB,GAAG,SAAS,CAAA;IACvC,QAAQ,CAAC,EAAE,wBAAwB,CAAA;CACpC,GAAG,MAAM,CAeT"}
|
package/lib/session-cwd.js
CHANGED
|
@@ -18,18 +18,21 @@ function canonicalDirectory(path) {
|
|
|
18
18
|
}
|
|
19
19
|
/**
|
|
20
20
|
* Resolves the only cwd a local coding process may receive for this request.
|
|
21
|
-
*
|
|
22
|
-
* fields or a persisted/stale session id cannot select
|
|
21
|
+
* A same-module marker or the Host-owned exact live-agent proof is mandatory;
|
|
22
|
+
* copied request fields or a persisted/stale session id cannot select a path.
|
|
23
23
|
*/
|
|
24
24
|
export function resolveTrustedSessionCwd(input) {
|
|
25
25
|
const sessionId = input.request.sessionId;
|
|
26
|
-
if (sessionId === undefined ||
|
|
26
|
+
if (sessionId === undefined || Object.hasOwn(input.request, 'purpose') || !Object.isFrozen(input.request)) {
|
|
27
27
|
throw new TrustedSessionCwdError();
|
|
28
28
|
}
|
|
29
29
|
const session = input.sessions?.get(sessionId);
|
|
30
30
|
if (session === undefined || session.id !== sessionId || typeof session.header.cwd !== 'string') {
|
|
31
31
|
throw new TrustedSessionCwdError();
|
|
32
32
|
}
|
|
33
|
+
const loopOwned = isAgentLoopRequest(input.request) || input.attestor?.claim(input.request, session) === true;
|
|
34
|
+
if (!loopOwned)
|
|
35
|
+
throw new TrustedSessionCwdError();
|
|
33
36
|
const configuredCwd = canonicalDirectory(input.configuredCwd);
|
|
34
37
|
const sessionCwd = canonicalDirectory(session.header.cwd);
|
|
35
38
|
if (configuredCwd !== sessionCwd)
|
package/lib/session-cwd.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-cwd.js","sourceRoot":"","sources":["../src/session-cwd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,EAAE,kBAAkB,EAAwB,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"session-cwd.js","sourceRoot":"","sources":["../src/session-cwd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,EAAE,kBAAkB,EAAwB,MAAM,sBAAsB,CAAA;AAY/E,MAAM,OAAO,sBAAuB,SAAQ,KAAK;IAC/C;QACE,KAAK,CAAC,wEAAwE,CAAC,CAAA;IACjF,CAAC;CACF;AAED,SAAS,kBAAkB,CAAC,IAAY;IACtC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,MAAM,IAAI,sBAAsB,EAAE,CAAA;IACzD,IAAI,CAAC;QACH,OAAO,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAClC,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,sBAAsB,EAAE,CAAA;IACpC,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,wBAAwB,CAAC,KAKxC;IACC,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAA;IACzC,IAAI,SAAS,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1G,MAAM,IAAI,sBAAsB,EAAE,CAAA;IACpC,CAAC;IACD,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,SAAS,CAAC,CAAA;IAC9C,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,EAAE,KAAK,SAAS,IAAI,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;QAChG,MAAM,IAAI,sBAAsB,EAAE,CAAA;IACpC,CAAC;IACD,MAAM,SAAS,GAAG,kBAAkB,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,IAAI,CAAA;IAC7G,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,sBAAsB,EAAE,CAAA;IAClD,MAAM,aAAa,GAAG,kBAAkB,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;IAC7D,MAAM,UAAU,GAAG,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IACzD,IAAI,aAAa,KAAK,UAAU;QAAE,MAAM,IAAI,sBAAsB,EAAE,CAAA;IACpE,OAAO,UAAU,CAAA;AACnB,CAAC"}
|
package/lib/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "0.1.
|
|
1
|
+
export declare const version = "0.1.4";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/lib/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = '0.1.
|
|
1
|
+
export const version = '0.1.4';
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dsh-enhanced/coding-subscription-provider",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.4",
|
|
4
4
|
"description": "Use locally authenticated coding subscriptions as DeepSeek Harness model providers.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -48,21 +48,35 @@
|
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
50
|
"@deepseek-ai/schemastery": "3.18.1",
|
|
51
|
-
"@dsh-enhanced/llm-route-capabilities": "0.1.
|
|
51
|
+
"@dsh-enhanced/llm-route-capabilities": "0.1.4"
|
|
52
52
|
},
|
|
53
53
|
"peerDependencies": {
|
|
54
54
|
"@deepseek-ai/cordis": "^4.0.1",
|
|
55
|
+
"@deepseek-ai/dsh-agent": ">=0.1.0-rc.8 <0.2.0",
|
|
55
56
|
"@deepseek-ai/dsh-attachment": ">=0.1.0-rc.8 <0.2.0",
|
|
56
57
|
"@deepseek-ai/dsh-llm": ">=0.1.0-rc.8 <0.2.0",
|
|
57
58
|
"@deepseek-ai/dsh-session": ">=0.1.0-rc.8 <0.2.0"
|
|
58
59
|
},
|
|
59
60
|
"peerDependenciesMeta": {
|
|
61
|
+
"@deepseek-ai/cordis": {
|
|
62
|
+
"optional": true
|
|
63
|
+
},
|
|
64
|
+
"@deepseek-ai/dsh-agent": {
|
|
65
|
+
"optional": true
|
|
66
|
+
},
|
|
60
67
|
"@deepseek-ai/dsh-attachment": {
|
|
61
68
|
"optional": true
|
|
69
|
+
},
|
|
70
|
+
"@deepseek-ai/dsh-llm": {
|
|
71
|
+
"optional": true
|
|
72
|
+
},
|
|
73
|
+
"@deepseek-ai/dsh-session": {
|
|
74
|
+
"optional": true
|
|
62
75
|
}
|
|
63
76
|
},
|
|
64
77
|
"devDependencies": {
|
|
65
78
|
"@deepseek-ai/cordis": "4.0.1",
|
|
79
|
+
"@deepseek-ai/dsh-agent": "0.1.0-rc.8",
|
|
66
80
|
"@deepseek-ai/dsh-attachment": "0.1.0-rc.8",
|
|
67
81
|
"@deepseek-ai/dsh-llm": "0.1.0-rc.8",
|
|
68
82
|
"@deepseek-ai/dsh-session": "0.1.0-rc.8",
|