@ycodium-ai/agent-dsh 0.2.3681 → 0.2.3766
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/dist/index.js +116 -49
- package/locales/en.json +9 -0
- package/locales/zh-CN.json +9 -0
- package/package.json +7 -5
package/dist/index.js
CHANGED
|
@@ -7369,6 +7369,13 @@ var require_dist = __commonJS({
|
|
|
7369
7369
|
|
|
7370
7370
|
// src/index.ts
|
|
7371
7371
|
import { definePlugin } from "@ycodium-ai/plugin-api";
|
|
7372
|
+
import * as NodeOS6 from "node:os";
|
|
7373
|
+
import * as NodePath7 from "node:path";
|
|
7374
|
+
import {
|
|
7375
|
+
EXECUTOR_EFFECTIVE_PAYLOAD_SCHEMA,
|
|
7376
|
+
executorHomeEffectiveValue,
|
|
7377
|
+
readExecutorEffectiveRequest
|
|
7378
|
+
} from "@ycodium-ai/plugin-api/executor";
|
|
7372
7379
|
|
|
7373
7380
|
// src/card.ts
|
|
7374
7381
|
var DSH_DRIVER_KIND = "dsh";
|
|
@@ -7382,6 +7389,8 @@ var DSH_CARD = {
|
|
|
7382
7389
|
// 宿主旧实现把它写死在 DshAcpSupport,这里落在名片上)。
|
|
7383
7390
|
launchArgs: "--profile acp",
|
|
7384
7391
|
homeEnvVar: "DSH_HOME",
|
|
7392
|
+
// 设置表单里留空的格子此刻会用什么,见 index.ts 的同名命令。
|
|
7393
|
+
effectiveCommand: "effectiveConfig",
|
|
7385
7394
|
environment: [{ name: "DEEPSEEK_API_KEY", sensitive: true }],
|
|
7386
7395
|
install: { kind: "npm" },
|
|
7387
7396
|
// 凭据从环境读,没有登录命令可跑,更没有设备码流程——signIn 这一项不实现。
|
|
@@ -7692,8 +7701,8 @@ var UnboundedEventStream = class {
|
|
|
7692
7701
|
iterators.subscribers.delete(subscriber);
|
|
7693
7702
|
return { value: void 0, done: true };
|
|
7694
7703
|
}
|
|
7695
|
-
await new Promise((
|
|
7696
|
-
subscriber.wake =
|
|
7704
|
+
await new Promise((resolve4) => {
|
|
7705
|
+
subscriber.wake = resolve4;
|
|
7697
7706
|
});
|
|
7698
7707
|
}
|
|
7699
7708
|
},
|
|
@@ -13912,7 +13921,7 @@ var recursive = /* @__PURE__ */ new WeakMap();
|
|
|
13912
13921
|
var NONE = 0;
|
|
13913
13922
|
var ASSUMED = 1;
|
|
13914
13923
|
var PROVEN = 2;
|
|
13915
|
-
function isRecursive(inst, stack,
|
|
13924
|
+
function isRecursive(inst, stack, resolve4) {
|
|
13916
13925
|
const cached2 = recursive.get(inst);
|
|
13917
13926
|
if (cached2 !== void 0)
|
|
13918
13927
|
return cached2 ? PROVEN : NONE;
|
|
@@ -13922,7 +13931,7 @@ function isRecursive(inst, stack, resolve3) {
|
|
|
13922
13931
|
let result = NONE;
|
|
13923
13932
|
const check2 = (child) => {
|
|
13924
13933
|
if (result !== PROVEN && child?._zod) {
|
|
13925
|
-
const answer = isRecursive(child, stack,
|
|
13934
|
+
const answer = isRecursive(child, stack, resolve4);
|
|
13926
13935
|
if (answer > result)
|
|
13927
13936
|
result = answer;
|
|
13928
13937
|
}
|
|
@@ -13933,7 +13942,7 @@ function isRecursive(inst, stack, resolve3) {
|
|
|
13933
13942
|
const desc = Object.getOwnPropertyDescriptor(sh, key);
|
|
13934
13943
|
if (spread && !desc.enumerable)
|
|
13935
13944
|
continue;
|
|
13936
|
-
const child = desc.get ? ASSUMED : desc.value?._zod ? isRecursive(desc.value, stack,
|
|
13945
|
+
const child = desc.get ? ASSUMED : desc.value?._zod ? isRecursive(desc.value, stack, resolve4) : NONE;
|
|
13937
13946
|
if (child > answer)
|
|
13938
13947
|
answer = child;
|
|
13939
13948
|
}
|
|
@@ -13997,7 +14006,7 @@ function isRecursive(inst, stack, resolve3) {
|
|
|
13997
14006
|
break;
|
|
13998
14007
|
// `$ZodLazy` caches its inner on the def, so a resolved edge is followed exactly
|
|
13999
14008
|
case "lazy": {
|
|
14000
|
-
const inner = def._cachedInner ?? (
|
|
14009
|
+
const inner = def._cachedInner ?? (resolve4 ? inst._zod.innerType : void 0);
|
|
14001
14010
|
merge2(inner ? isRecursive(inner, stack, false) : ASSUMED);
|
|
14002
14011
|
break;
|
|
14003
14012
|
}
|
|
@@ -30661,11 +30670,11 @@ var Connection = class {
|
|
|
30661
30670
|
const id = this.nextRequestId++;
|
|
30662
30671
|
let cancel = () => {
|
|
30663
30672
|
};
|
|
30664
|
-
const response = new Promise((
|
|
30673
|
+
const response = new Promise((resolve4, reject) => {
|
|
30665
30674
|
const pendingResponse = {
|
|
30666
30675
|
resolve: (value) => {
|
|
30667
30676
|
try {
|
|
30668
|
-
|
|
30677
|
+
resolve4(mapResponse ? mapResponse(value) : value);
|
|
30669
30678
|
} catch (error62) {
|
|
30670
30679
|
reject(error62);
|
|
30671
30680
|
}
|
|
@@ -30722,8 +30731,8 @@ var Connection = class {
|
|
|
30722
30731
|
this.stream = stream;
|
|
30723
30732
|
this.staticHandlers = handlers;
|
|
30724
30733
|
this.allowBatches = options?.allowBatches ?? true;
|
|
30725
|
-
this.closedPromise = new Promise((
|
|
30726
|
-
this.abortController.signal.addEventListener("abort", () =>
|
|
30734
|
+
this.closedPromise = new Promise((resolve4) => {
|
|
30735
|
+
this.abortController.signal.addEventListener("abort", () => resolve4());
|
|
30727
30736
|
});
|
|
30728
30737
|
void this.receive();
|
|
30729
30738
|
}
|
|
@@ -31617,8 +31626,8 @@ var AsyncQueue = class {
|
|
|
31617
31626
|
if (this.failed) {
|
|
31618
31627
|
return Promise.reject(this.failure);
|
|
31619
31628
|
}
|
|
31620
|
-
return new Promise((
|
|
31621
|
-
this.waiters.push({ resolve:
|
|
31629
|
+
return new Promise((resolve4, reject) => {
|
|
31630
|
+
this.waiters.push({ resolve: resolve4, reject });
|
|
31622
31631
|
});
|
|
31623
31632
|
}
|
|
31624
31633
|
};
|
|
@@ -32662,12 +32671,12 @@ function createAcpConnection(options) {
|
|
|
32662
32671
|
failIfClosed();
|
|
32663
32672
|
const id = nextRequestId;
|
|
32664
32673
|
nextRequestId += 1;
|
|
32665
|
-
const { promise: promise2, resolve:
|
|
32674
|
+
const { promise: promise2, resolve: resolve4, reject } = Promise.withResolvers();
|
|
32666
32675
|
pending.set(String(id), {
|
|
32667
32676
|
method,
|
|
32668
32677
|
...promptId === void 0 ? {} : { promptId },
|
|
32669
32678
|
...onArrival === void 0 ? {} : { onArrival },
|
|
32670
|
-
resolve:
|
|
32679
|
+
resolve: resolve4,
|
|
32671
32680
|
reject
|
|
32672
32681
|
});
|
|
32673
32682
|
const message = params === void 0 ? { jsonrpc: "2.0", id, method } : { jsonrpc: "2.0", id, method, params };
|
|
@@ -32696,8 +32705,8 @@ function createAcpConnection(options) {
|
|
|
32696
32705
|
if (inboundBatches === 0) {
|
|
32697
32706
|
return;
|
|
32698
32707
|
}
|
|
32699
|
-
await new Promise((
|
|
32700
|
-
idleWaiters.push(
|
|
32708
|
+
await new Promise((resolve4) => {
|
|
32709
|
+
idleWaiters.push(resolve4);
|
|
32701
32710
|
if (inboundBatches === 0) {
|
|
32702
32711
|
releaseIdleWaiters();
|
|
32703
32712
|
}
|
|
@@ -32722,23 +32731,31 @@ function createAcpConnection(options) {
|
|
|
32722
32731
|
function normalizeModelId(value) {
|
|
32723
32732
|
return value?.trim() || void 0;
|
|
32724
32733
|
}
|
|
32725
|
-
function adoptReportedConfigOptions(state, configOptions) {
|
|
32734
|
+
function adoptReportedConfigOptions(state, configOptions, fromAgent = true) {
|
|
32726
32735
|
const option = state.modelConfigId === void 0 ? void 0 : findConfigOptionEntry(configOptions, state.modelConfigId);
|
|
32727
32736
|
const value = option?.["currentValue"];
|
|
32728
32737
|
const reported = typeof value === "string" ? normalizeModelId(value) : void 0;
|
|
32729
32738
|
if (reported === void 0) return { ...state, configOptions };
|
|
32730
32739
|
const { modelUnconfirmed: _confirmed, ...known } = state;
|
|
32731
|
-
|
|
32740
|
+
const stillReported = fromAgent || state.currentModelReported === true && reported === state.currentModelId;
|
|
32741
|
+
const { currentModelReported: _stale, ...unreported } = known;
|
|
32742
|
+
return {
|
|
32743
|
+
...stillReported ? known : unreported,
|
|
32744
|
+
configOptions,
|
|
32745
|
+
currentModelId: reported,
|
|
32746
|
+
...stillReported ? { currentModelReported: true } : {}
|
|
32747
|
+
};
|
|
32732
32748
|
}
|
|
32733
32749
|
function forgetConfigOptionValue(state, configId) {
|
|
32734
32750
|
const forgetsModel = configId === void 0 || configId === state.modelConfigId;
|
|
32751
|
+
const { currentModelReported: _forgottenReport, ...withoutReport } = state;
|
|
32735
32752
|
const configOptions = configId !== void 0 && Array.isArray(state.configOptions) ? state.configOptions.map((option) => {
|
|
32736
32753
|
if (!isRecord2(option) || option["id"] !== configId) return option;
|
|
32737
32754
|
const { currentValue: _forgotten, ...rest } = option;
|
|
32738
32755
|
return rest;
|
|
32739
32756
|
}) : state.configOptions;
|
|
32740
32757
|
return {
|
|
32741
|
-
...state,
|
|
32758
|
+
...forgetsModel ? withoutReport : state,
|
|
32742
32759
|
configOptions,
|
|
32743
32760
|
...forgetsModel ? { currentModelId: void 0, modelUnconfirmed: true } : {}
|
|
32744
32761
|
};
|
|
@@ -32755,6 +32772,7 @@ function modelSelectionStateFromSetup(setup) {
|
|
|
32755
32772
|
sessionModelsAdvertised: sessionModels !== void 0,
|
|
32756
32773
|
modelConfigId,
|
|
32757
32774
|
currentModelId,
|
|
32775
|
+
...currentModelId === void 0 ? {} : { currentModelReported: true },
|
|
32758
32776
|
advertisedModelValues: strategy === "config-option" ? modelConfigOption === void 0 ? [] : collectSessionConfigOptionValues(modelConfigOption) : collectSessionModelIds(sessionModels),
|
|
32759
32777
|
configOptions: setup.configOptions,
|
|
32760
32778
|
catalogSetup: setup
|
|
@@ -32773,8 +32791,8 @@ var Mutex = class {
|
|
|
32773
32791
|
this.locked = true;
|
|
32774
32792
|
return Promise.resolve();
|
|
32775
32793
|
}
|
|
32776
|
-
return new Promise((
|
|
32777
|
-
this.waiters.push(
|
|
32794
|
+
return new Promise((resolve4) => {
|
|
32795
|
+
this.waiters.push(resolve4);
|
|
32778
32796
|
});
|
|
32779
32797
|
}
|
|
32780
32798
|
tryAcquire() {
|
|
@@ -32974,9 +32992,9 @@ function createExecutorLifecycle({
|
|
|
32974
32992
|
let timer;
|
|
32975
32993
|
await Promise.race([
|
|
32976
32994
|
connection.closed.catch(() => void 0),
|
|
32977
|
-
new Promise((
|
|
32995
|
+
new Promise((resolve4) => {
|
|
32978
32996
|
timer = setTimeout(
|
|
32979
|
-
|
|
32997
|
+
resolve4,
|
|
32980
32998
|
options.resultDrainTimeoutMs ?? DEFAULT_RESULT_DRAIN_TIMEOUT_MS
|
|
32981
32999
|
);
|
|
32982
33000
|
})
|
|
@@ -33542,14 +33560,28 @@ function createExecutorPrompt({
|
|
|
33542
33560
|
}
|
|
33543
33561
|
};
|
|
33544
33562
|
const alignTurnOptions = async (input2, sessionId, generation, isStale, signal) => {
|
|
33563
|
+
const before = shared.modelSelectionState;
|
|
33545
33564
|
const applied = await applyRequestedModel({
|
|
33546
|
-
state:
|
|
33565
|
+
state: before,
|
|
33547
33566
|
acpSessionId: sessionId,
|
|
33548
33567
|
requestedModelId: input2.requestedModelId,
|
|
33549
33568
|
expectedGeneration: generation,
|
|
33550
33569
|
signal
|
|
33551
33570
|
});
|
|
33552
33571
|
shared.modelSelectionState = applied;
|
|
33572
|
+
if (applied.currentModelId !== void 0 && (applied.currentModelId !== before.currentModelId || applied.currentModelReported !== before.currentModelReported)) {
|
|
33573
|
+
emit({
|
|
33574
|
+
type: "thread.metadata.updated",
|
|
33575
|
+
...stamp(),
|
|
33576
|
+
provider: options.provider,
|
|
33577
|
+
threadId: options.threadId,
|
|
33578
|
+
...shared.activeTurnId === void 0 ? {} : { turnId: shared.activeTurnId },
|
|
33579
|
+
payload: {
|
|
33580
|
+
model: applied.currentModelId,
|
|
33581
|
+
modelSource: applied.currentModelReported === true ? "reported" : "echo"
|
|
33582
|
+
}
|
|
33583
|
+
});
|
|
33584
|
+
}
|
|
33553
33585
|
if (isStale()) return;
|
|
33554
33586
|
const switched = applied.configOptions;
|
|
33555
33587
|
let aligned;
|
|
@@ -33574,7 +33606,8 @@ function createExecutorPrompt({
|
|
|
33574
33606
|
if (aligned.configOptions !== switched) {
|
|
33575
33607
|
shared.modelSelectionState = adoptReportedConfigOptions(
|
|
33576
33608
|
shared.modelSelectionState,
|
|
33577
|
-
aligned.configOptions
|
|
33609
|
+
aligned.configOptions,
|
|
33610
|
+
false
|
|
33578
33611
|
);
|
|
33579
33612
|
}
|
|
33580
33613
|
if (aligned.unsupportedEffort !== void 0) {
|
|
@@ -33806,12 +33839,12 @@ function createPromptResults({
|
|
|
33806
33839
|
}) {
|
|
33807
33840
|
const prompts = /* @__PURE__ */ new Map();
|
|
33808
33841
|
const add = (identity, finish) => {
|
|
33809
|
-
const { promise: done, resolve:
|
|
33842
|
+
const { promise: done, resolve: resolve4 } = Promise.withResolvers();
|
|
33810
33843
|
const record2 = {
|
|
33811
33844
|
...identity,
|
|
33812
33845
|
finish,
|
|
33813
33846
|
done,
|
|
33814
|
-
resolve:
|
|
33847
|
+
resolve: resolve4,
|
|
33815
33848
|
rejected: false,
|
|
33816
33849
|
interrupted: false,
|
|
33817
33850
|
finished: false
|
|
@@ -33859,9 +33892,9 @@ function createPromptResults({
|
|
|
33859
33892
|
try {
|
|
33860
33893
|
const drained = await Promise.race([
|
|
33861
33894
|
Promise.all(claimed.map((record2) => record2.done)).then(() => true),
|
|
33862
|
-
new Promise((
|
|
33895
|
+
new Promise((resolve4) => {
|
|
33863
33896
|
timer = setTimeout(
|
|
33864
|
-
() =>
|
|
33897
|
+
() => resolve4(false),
|
|
33865
33898
|
options.resultDrainTimeoutMs ?? DEFAULT_RESULT_DRAIN_TIMEOUT_MS
|
|
33866
33899
|
);
|
|
33867
33900
|
})
|
|
@@ -34021,14 +34054,14 @@ function createExecutorRequests({
|
|
|
34021
34054
|
}
|
|
34022
34055
|
}
|
|
34023
34056
|
const requestId = randomId();
|
|
34024
|
-
const outcome = await new Promise((
|
|
34057
|
+
const outcome = await new Promise((resolve4) => {
|
|
34025
34058
|
const pending = {
|
|
34026
34059
|
requestId,
|
|
34027
34060
|
request: params,
|
|
34028
34061
|
permissionRequest,
|
|
34029
34062
|
turnId: shared.activeTurnId,
|
|
34030
34063
|
settled: false,
|
|
34031
|
-
resolve:
|
|
34064
|
+
resolve: resolve4
|
|
34032
34065
|
};
|
|
34033
34066
|
approvals.add(pending);
|
|
34034
34067
|
emit(
|
|
@@ -34246,14 +34279,14 @@ function createExecutorRuntime({
|
|
|
34246
34279
|
if (!promptMutex.isLocked) {
|
|
34247
34280
|
return true;
|
|
34248
34281
|
}
|
|
34249
|
-
return await new Promise((
|
|
34282
|
+
return await new Promise((resolve4) => {
|
|
34250
34283
|
const timer = setTimeout(() => {
|
|
34251
34284
|
shared.promptWaiters = shared.promptWaiters.filter((waiter) => waiter !== onSettle);
|
|
34252
|
-
|
|
34285
|
+
resolve4(false);
|
|
34253
34286
|
}, timeoutMs);
|
|
34254
34287
|
const onSettle = () => {
|
|
34255
34288
|
clearTimeout(timer);
|
|
34256
|
-
|
|
34289
|
+
resolve4(true);
|
|
34257
34290
|
};
|
|
34258
34291
|
shared.promptWaiters.push(onSettle);
|
|
34259
34292
|
});
|
|
@@ -34495,18 +34528,20 @@ function createExecutorSession({
|
|
|
34495
34528
|
const base = ours !== void 0 && ours.seq > issuedAt ? ours.configOptions : configOptions;
|
|
34496
34529
|
return { configOptions: withConfigOptionValue(base, configId, value), reported: false };
|
|
34497
34530
|
};
|
|
34498
|
-
const writeConfigOption = async (...args) => (await writeConfigOptionReported(...args)).configOptions;
|
|
34499
34531
|
const switchModel = async (input2) => {
|
|
34500
34532
|
let configOptions = input2.state.configOptions;
|
|
34533
|
+
let fromAgent = true;
|
|
34501
34534
|
const write = { option: "model", signal: input2.signal };
|
|
34502
34535
|
if (input2.state.strategy === "config-option" && input2.state.modelConfigId !== void 0) {
|
|
34503
|
-
|
|
34536
|
+
const written = await writeConfigOptionReported(
|
|
34504
34537
|
input2.sessionId,
|
|
34505
34538
|
configOptions,
|
|
34506
34539
|
input2.state.modelConfigId,
|
|
34507
34540
|
input2.value,
|
|
34508
34541
|
write
|
|
34509
34542
|
);
|
|
34543
|
+
configOptions = written.configOptions;
|
|
34544
|
+
fromAgent = written.reported;
|
|
34510
34545
|
} else {
|
|
34511
34546
|
const before = shared.configOptionUpdates.get(input2.sessionId);
|
|
34512
34547
|
const pending = connection.begin("session/set_model", {
|
|
@@ -34524,7 +34559,12 @@ function createExecutorSession({
|
|
|
34524
34559
|
throw new AcpExecutorDisposedError();
|
|
34525
34560
|
}
|
|
34526
34561
|
const { modelUnconfirmed: _confirmed, ...known } = input2.state;
|
|
34527
|
-
|
|
34562
|
+
const { currentModelReported: _echoed, ...requested } = known;
|
|
34563
|
+
return adoptReportedConfigOptions(
|
|
34564
|
+
{ ...requested, currentModelId: input2.value },
|
|
34565
|
+
configOptions,
|
|
34566
|
+
fromAgent
|
|
34567
|
+
);
|
|
34528
34568
|
};
|
|
34529
34569
|
const applyRequestedModel = async (input2) => {
|
|
34530
34570
|
const requestedModelId = normalizeModelId(input2.requestedModelId) ?? "";
|
|
@@ -34668,7 +34708,8 @@ function createExecutorSession({
|
|
|
34668
34708
|
});
|
|
34669
34709
|
nextModelSelectionState = adoptReportedConfigOptions(
|
|
34670
34710
|
nextModelSelectionState,
|
|
34671
|
-
aligned.configOptions
|
|
34711
|
+
aligned.configOptions,
|
|
34712
|
+
false
|
|
34672
34713
|
);
|
|
34673
34714
|
if (aligned.unsupportedEffort !== void 0) {
|
|
34674
34715
|
options.log?.info("requested effort is not offered by this model; using its default", {
|
|
@@ -34701,7 +34742,8 @@ function createExecutorSession({
|
|
|
34701
34742
|
initializeResult: initialized,
|
|
34702
34743
|
sessionSetupResult: setup,
|
|
34703
34744
|
modelConfigId: extractModelConfigId(setup),
|
|
34704
|
-
modelId: nextModelSelectionState.currentModelId
|
|
34745
|
+
modelId: nextModelSelectionState.currentModelId,
|
|
34746
|
+
modelReported: nextModelSelectionState.currentModelReported === true
|
|
34705
34747
|
};
|
|
34706
34748
|
shared.startResult = result;
|
|
34707
34749
|
shared.status = "ready";
|
|
@@ -35659,6 +35701,9 @@ function createAcpExecutor(options) {
|
|
|
35659
35701
|
get modelId() {
|
|
35660
35702
|
return shared.modelSelectionState.currentModelId;
|
|
35661
35703
|
},
|
|
35704
|
+
get modelReported() {
|
|
35705
|
+
return shared.modelSelectionState.currentModelReported === true;
|
|
35706
|
+
},
|
|
35662
35707
|
get status() {
|
|
35663
35708
|
return shared.status;
|
|
35664
35709
|
},
|
|
@@ -35780,13 +35825,13 @@ function createRetryableClose(run) {
|
|
|
35780
35825
|
|
|
35781
35826
|
// ../../packages/ycodium-acp-executor/src/prompt-dispatch.ts
|
|
35782
35827
|
var dispatchAcpPrompt = (executor, input2) => {
|
|
35783
|
-
const { promise: dispatched, resolve:
|
|
35828
|
+
const { promise: dispatched, resolve: resolve4 } = Promise.withResolvers();
|
|
35784
35829
|
let written = false;
|
|
35785
35830
|
const finished = executor.prompt({
|
|
35786
35831
|
...input2,
|
|
35787
35832
|
onDispatched: (turnId) => {
|
|
35788
35833
|
written = true;
|
|
35789
|
-
|
|
35834
|
+
resolve4(turnId);
|
|
35790
35835
|
}
|
|
35791
35836
|
});
|
|
35792
35837
|
return Promise.race([
|
|
@@ -35841,7 +35886,7 @@ function toAcpMcpServers(entries) {
|
|
|
35841
35886
|
// ../../packages/ycodium-acp-executor/src/probe.ts
|
|
35842
35887
|
function withProbeTimeout(promise2, timeoutMs, what, signal) {
|
|
35843
35888
|
signal?.throwIfAborted();
|
|
35844
|
-
return new Promise((
|
|
35889
|
+
return new Promise((resolve4, reject) => {
|
|
35845
35890
|
const onAbort = () => {
|
|
35846
35891
|
clearTimeout(timer);
|
|
35847
35892
|
reject(signal?.reason ?? new Error("aborted"));
|
|
@@ -35856,7 +35901,7 @@ function withProbeTimeout(promise2, timeoutMs, what, signal) {
|
|
|
35856
35901
|
(value) => {
|
|
35857
35902
|
clearTimeout(timer);
|
|
35858
35903
|
signal?.removeEventListener("abort", onAbort);
|
|
35859
|
-
|
|
35904
|
+
resolve4(value);
|
|
35860
35905
|
},
|
|
35861
35906
|
(error62) => {
|
|
35862
35907
|
clearTimeout(timer);
|
|
@@ -36768,8 +36813,8 @@ var dshToolSubagents = {
|
|
|
36768
36813
|
|
|
36769
36814
|
// src/dshInstance.ts
|
|
36770
36815
|
var RESUME_SCHEMA_VERSION = 1;
|
|
36771
|
-
var yieldTick = () => new Promise((
|
|
36772
|
-
setImmediate(
|
|
36816
|
+
var yieldTick = () => new Promise((resolve4) => {
|
|
36817
|
+
setImmediate(resolve4);
|
|
36773
36818
|
});
|
|
36774
36819
|
var EventBus = class {
|
|
36775
36820
|
#queued = [];
|
|
@@ -36796,8 +36841,8 @@ var EventBus = class {
|
|
|
36796
36841
|
const queued = this.#queued.shift();
|
|
36797
36842
|
if (queued !== void 0) return Promise.resolve({ done: false, value: queued });
|
|
36798
36843
|
if (this.#closed) return Promise.resolve({ done: true, value: void 0 });
|
|
36799
|
-
return new Promise((
|
|
36800
|
-
this.#waiters.push(
|
|
36844
|
+
return new Promise((resolve4) => {
|
|
36845
|
+
this.#waiters.push(resolve4);
|
|
36801
36846
|
});
|
|
36802
36847
|
}
|
|
36803
36848
|
};
|
|
@@ -36972,7 +37017,11 @@ var createDshInstance = (config2, host) => {
|
|
|
36972
37017
|
createdAt,
|
|
36973
37018
|
updatedAt: createdAt,
|
|
36974
37019
|
resumeCursor,
|
|
36975
|
-
...started.modelId === void 0 ? {} : {
|
|
37020
|
+
...started.modelId === void 0 ? {} : {
|
|
37021
|
+
model: started.modelId,
|
|
37022
|
+
// agent 在握手里报的才是读回的;切型号走 session/set_model 时回包不带型号,那只是请求值。
|
|
37023
|
+
modelSource: started.modelReported ? "reported" : "echo"
|
|
37024
|
+
},
|
|
36976
37025
|
...input2.bindingGeneration === void 0 ? {} : { bindingGeneration: input2.bindingGeneration }
|
|
36977
37026
|
};
|
|
36978
37027
|
registerSession(input2.threadId, {
|
|
@@ -37095,6 +37144,7 @@ var createDshInstance = (config2, host) => {
|
|
|
37095
37144
|
var executors = [
|
|
37096
37145
|
{
|
|
37097
37146
|
card: DSH_CARD,
|
|
37147
|
+
lifecycle: [{ kind: "detect", reversible: true }],
|
|
37098
37148
|
createInstance: async (config2, host) => {
|
|
37099
37149
|
host.log.info("createInstance");
|
|
37100
37150
|
return createDshInstance(config2, host);
|
|
@@ -37103,9 +37153,26 @@ var executors = [
|
|
|
37103
37153
|
];
|
|
37104
37154
|
var index_default = definePlugin({
|
|
37105
37155
|
id: "agent-dsh",
|
|
37106
|
-
apiVersion:
|
|
37156
|
+
apiVersion: 56,
|
|
37107
37157
|
executors,
|
|
37108
37158
|
activate(ctx) {
|
|
37159
|
+
ctx.command({
|
|
37160
|
+
name: "effectiveConfig",
|
|
37161
|
+
description: "Settings form: the account directory an empty path resolves to on this machine.",
|
|
37162
|
+
scope: "read",
|
|
37163
|
+
payloadSchema: EXECUTOR_EFFECTIVE_PAYLOAD_SCHEMA,
|
|
37164
|
+
handle: async (payload) => {
|
|
37165
|
+
const request = readExecutorEffectiveRequest(payload);
|
|
37166
|
+
return {
|
|
37167
|
+
homePath: executorHomeEffectiveValue(
|
|
37168
|
+
"DSH_HOME",
|
|
37169
|
+
request,
|
|
37170
|
+
process.env,
|
|
37171
|
+
(value) => value === void 0 ? NodePath7.join(NodeOS6.homedir(), ".dsh") : NodePath7.resolve(expandHomePath(value))
|
|
37172
|
+
)
|
|
37173
|
+
};
|
|
37174
|
+
}
|
|
37175
|
+
});
|
|
37109
37176
|
ctx.log.info("dsh executor ready");
|
|
37110
37177
|
}
|
|
37111
37178
|
});
|
package/locales/en.json
CHANGED
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
{
|
|
2
|
+
"presentation": {
|
|
3
|
+
"name": "DeepSeek Harness",
|
|
4
|
+
"description": "Run DeepSeek Harness with the dsh CLI."
|
|
5
|
+
},
|
|
2
6
|
"form": {
|
|
3
7
|
"binaryPath": {
|
|
4
8
|
"title": "Program path",
|
|
@@ -9,6 +13,11 @@
|
|
|
9
13
|
"title": "Account directory",
|
|
10
14
|
"description": "Sessions live here, so providers sharing this directory can pick up each other's threads and providers with different directories cannot. Leave empty to use the CLI's default (~/.dsh).",
|
|
11
15
|
"placeholder": "e.g. ~/.dsh-work"
|
|
16
|
+
},
|
|
17
|
+
"effective": {
|
|
18
|
+
"provider": "{{name}} in this provider",
|
|
19
|
+
"machine": "{{name}} on this machine",
|
|
20
|
+
"default": "default"
|
|
12
21
|
}
|
|
13
22
|
},
|
|
14
23
|
"usage": {
|
package/locales/zh-CN.json
CHANGED
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
{
|
|
2
|
+
"presentation": {
|
|
3
|
+
"name": "DeepSeek Harness",
|
|
4
|
+
"description": "用 dsh CLI 跑 DeepSeek Harness。"
|
|
5
|
+
},
|
|
2
6
|
"form": {
|
|
3
7
|
"binaryPath": {
|
|
4
8
|
"title": "程序路径",
|
|
@@ -9,6 +13,11 @@
|
|
|
9
13
|
"title": "账号目录",
|
|
10
14
|
"description": "会话保存在这里,因此共用同一目录的 provider 可以接手彼此的会话,目录不同的则不能。留空则使用该命令行工具的默认目录(~/.dsh)。",
|
|
11
15
|
"placeholder": "例如 ~/.dsh-work"
|
|
16
|
+
},
|
|
17
|
+
"effective": {
|
|
18
|
+
"provider": "本 provider 的 {{name}}",
|
|
19
|
+
"machine": "本机的 {{name}}",
|
|
20
|
+
"default": "默认"
|
|
12
21
|
}
|
|
13
22
|
},
|
|
14
23
|
"usage": {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ycodium-ai/agent-dsh",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.3766",
|
|
4
4
|
"description": "DeepSeek Harness executor: dsh CLI over Agent Client Protocol stdio.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"ycodium",
|
|
@@ -22,14 +22,16 @@
|
|
|
22
22
|
"esbuild": "0.28.1",
|
|
23
23
|
"vite-plus": "0.2.2",
|
|
24
24
|
"yaml": "^2.9.0",
|
|
25
|
-
"ycodium-
|
|
26
|
-
"
|
|
27
|
-
"ycodium-executor
|
|
25
|
+
"@ycodium-ai/plugin-api": "0.2.3766",
|
|
26
|
+
"ycodium-executor-testing": "0.0.0",
|
|
27
|
+
"ycodium-acp-executor": "0.2.3766"
|
|
28
28
|
},
|
|
29
29
|
"ycodium": {
|
|
30
30
|
"plugin": "./dist/index.js",
|
|
31
31
|
"displayName": "DeepSeek Harness",
|
|
32
|
-
"
|
|
32
|
+
"displayNameKey": "presentation.name",
|
|
33
|
+
"description": "Run DeepSeek Harness with the dsh CLI.",
|
|
34
|
+
"descriptionKey": "presentation.description",
|
|
33
35
|
"icon": "./assets/icon.svg",
|
|
34
36
|
"permissions": [
|
|
35
37
|
{
|