npm - dsh-super-code - Versions diffs - 0.3.10 → 0.4.0 - Mend

dsh-super-code 0.3.10 → 0.4.0

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.

Files changed (926) hide show

package/lib/dsh/budget-settings.js CHANGED Viewed

@@ -35,6 +35,8 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
 import { Remote, TypertRemoteService } from '@deepseek-ai/dsh-typert-protocol';
 import { settingsConfigurationSchema, configurationValues, validateConfiguration } from './budgets.js';
 import { BasicCompactionEngine } from '@deepseek-ai/dsh-compaction-basic';
+import { randomUUID } from 'node:crypto';
+import { skillPackages } from './skill-packages.js';
 const namespace = 'super-code-budgets';
 /** Keep the evaluated budgets independent of changes to the host's defaults. */
 function withLegacyBudgets(config, ptcCeiling) {
@@ -54,6 +56,7 @@ export class BudgetSettings {
     ptcCeiling;
     key;
     defaults;
+    generation = randomUUID();
     constructor(settings, scope, ptcCeiling, key = namespace, defaults = () => ({})) {
         this.settings = settings;
         this.scope = scope;
@@ -65,7 +68,7 @@ export class BudgetSettings {
         const descriptor = this.settings.describe({ redactSecrets: true }).find(row => row.ns === this.key);
         if (!descriptor)
             throw new Error('Super Code budget settings are unavailable');
-        return { configuration: structuredClone(this.scope.get()), revision: descriptor.revision,
+        return { namespace: this.key, configuration: structuredClone(this.scope.get()), revision: descriptor.revision, generation: this.generation,
             writable: this.settings.writable, ptcMaxTimeoutMs: this.ptcCeiling(), defaults: structuredClone(this.defaults()) };
     }
     async save(content, expected) {
@@ -80,12 +83,18 @@ export class BudgetSettings {
         catch {
             return { ok: false, error: 'invalid' };
         }
-        const budgets = config.budgets;
-        if (budgets?.ptcTimeoutMs !== undefined || budgets?.ptcMaxTimeoutMs !== undefined) {
+        const previous = this.scope.get().budgets;
+        // Stored values may outlive a provider or its limits. Preserve them when
+        // editing other settings; only newly selected execution budgets need validation.
+        const changed = ['ptcTimeoutMs', 'ptcMaxTimeoutMs'].flatMap(key => {
+            const value = config.budgets?.[key];
+            return value !== undefined && value !== previous?.[key] ? [value] : [];
+        });
+        if (changed.length) {
             const ceiling = this.ptcCeiling();
             if (ceiling === false)
                 return { ok: false, error: 'ptc-unavailable' };
-            if ((budgets.ptcTimeoutMs ?? 0) > ceiling || (budgets.ptcMaxTimeoutMs ?? 0) > ceiling)
+            if (changed.some(value => value > ceiling))
                 return { ok: false, error: 'ptc-ceiling' };
         }
         return this.replace(config, expected);
@@ -94,10 +103,15 @@ export class BudgetSettings {
     async replace(config, expected) {
         if (!this.settings.writable)
             return { ok: false, error: 'read-only' };
-        if (!/^(0|[1-9]\d*)$/.test(expected) || !Number.isSafeInteger(Number(expected)))
+        const [revision, generation, extra] = expected.split(':');
+        if (extra !== undefined || generation === '' || !/^(0|[1-9]\d*)$/.test(revision) || !Number.isSafeInteger(Number(revision)))
             return { ok: false, error: 'invalid' };
+        // Numeric revisions can repeat after a service restart. Older clients may
+        // still send only the number; current clients also identify the instance.
+        if (generation !== undefined && generation !== this.generation)
+            return { ok: false, error: 'conflict' };
         try {
-            await this.settings.replace(this.key, config, Number(expected));
+            await this.settings.replace(this.key, config, Number(revision));
             return { ok: true, snapshot: this.read() };
         }
         catch (error) {
@@ -109,15 +123,21 @@ let SuperCodeBudgets = (() => {
     let _classSuper = TypertRemoteService;
     let _instanceExtraInitializers = [];
     let _readConfig_decorators;
+    let _openSkillsDirectory_decorators;
+    let _syncSkills_decorators;
     let _saveConfig_decorators;
     let _resetConfig_decorators;
     return class SuperCodeBudgets extends _classSuper {
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _readConfig_decorators = [Remote];
+            _openSkillsDirectory_decorators = [Remote];
+            _syncSkills_decorators = [Remote];
             _saveConfig_decorators = [Remote];
             _resetConfig_decorators = [Remote];
             __esDecorate(this, null, _readConfig_decorators, { kind: "method", name: "readConfig", static: false, private: false, access: { has: obj => "readConfig" in obj, get: obj => obj.readConfig }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _openSkillsDirectory_decorators, { kind: "method", name: "openSkillsDirectory", static: false, private: false, access: { has: obj => "openSkillsDirectory" in obj, get: obj => obj.openSkillsDirectory }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _syncSkills_decorators, { kind: "method", name: "syncSkills", static: false, private: false, access: { has: obj => "syncSkills" in obj, get: obj => obj.syncSkills }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _saveConfig_decorators, { kind: "method", name: "saveConfig", static: false, private: false, access: { has: obj => "saveConfig" in obj, get: obj => obj.saveConfig }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _resetConfig_decorators, { kind: "method", name: "resetConfig", static: false, private: false, access: { has: obj => "resetConfig" in obj, get: obj => obj.resetConfig }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -127,14 +147,28 @@ let SuperCodeBudgets = (() => {
             super(ctx, 'superCodeBudgets');
             this.settings = settings;
         }
-        readConfig() { return { ...this.settings.read(), shell: this.ctx.get('superCodeShell')?.status() }; }
+        readConfig() { return { ...this.settings.read(), skillPackages, skills: this.ctx.get('superCodeSkills')?.status(), shell: this.ctx.get('superCodeShell')?.status() }; }
+        async openSkillsDirectory() {
+            const skills = this.ctx.get('superCodeSkills');
+            if (!skills)
+                throw new Error('Skill directory unavailable');
+            return skills.open();
+        }
+        async syncSkills() {
+            await this.ctx.get('superCodeSkills')?.synchronize();
+            return this.readConfig();
+        }
         async saveConfig(content, expected) {
             const result = await this.settings.save(content, expected);
-            return result.ok ? { ...result, snapshot: { ...result.snapshot, shell: this.ctx.get('superCodeShell')?.status() } } : result;
+            if (result.ok)
+                await this.ctx.get('superCodeSkills')?.synchronize();
+            return result.ok ? { ...result, snapshot: { ...result.snapshot, skillPackages, skills: this.ctx.get('superCodeSkills')?.status(), shell: this.ctx.get('superCodeShell')?.status() } } : result;
         }
         async resetConfig(expected) {
             const result = await this.settings.reset(expected);
-            return result.ok ? { ...result, snapshot: { ...result.snapshot, shell: this.ctx.get('superCodeShell')?.status() } } : result;
+            if (result.ok)
+                await this.ctx.get('superCodeSkills')?.synchronize();
+            return result.ok ? { ...result, snapshot: { ...result.snapshot, skillPackages, skills: this.ctx.get('superCodeSkills')?.status(), shell: this.ctx.get('superCodeShell')?.status() } } : result;
         }
     };
 })();

package/lib/dsh/budget-settings.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"budget-settings.js","sourceRoot":"","sources":["../../src/dsh/budget-settings.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAA;AAC9E,OAAO,EAAE,2BAA2B,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAEtG,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAA;~~AAGzE~~,MAAM,SAAS,GAAG,oBAAoB,CAAA;~~AAmBtC~~,gFAAgF;AAChF,SAAS,iBAAiB,CAAC,MAAqB,EAAE,UAA0B;IAC1E,MAAM,UAAU,GAAG,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EACnE,MAAM,CAAC,OAAO,EAAE,eAAe,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,YAAY,IAAI,CAAC,CAAC,CAAC,CAAA;IACzF,OAAO;QACL,sBAAsB,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,GAAG,MAAM;QAC9E,OAAO,EAAE,EAAE,aAAa,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI;YACxE,gBAAgB,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,EAAE,kBAAkB,EAAE,CAAC;YACnE,GAAG,CAAC,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,eAAe,EAAE,UAAU,EAAE,CAAC;YAC5G,GAAG,MAAM,CAAC,OAAO;SAClB;KACF,CAAA;AACH,CAAC;AAED,MAAM,OAAO,cAAc;~~IACI~~;IAA2C;IACrD;IAAmD;IACnD;~~IAFnB~~,YAA6B,QAAwB,EAAmB,KAAgD,EACrG,UAAgC,EAAmB,MAAc,SAAS,EAC1E,WAAgC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;QAFhC,aAAQ,GAAR,QAAQ,CAAgB;QAAmB,UAAK,GAAL,KAAK,CAA2C;QACrG,eAAU,GAAV,UAAU,CAAsB;QAAmB,QAAG,GAAH,GAAG,CAAoB;QAC1E,aAAQ,GAAR,QAAQ,CAAkC;IAAG,CAAC;IAEjE,IAAI;QACF,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,GAAG,CAAC,CAAA;QACnG,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAA;QAC9E,OAAO,EAAE,aAAa,EAAE,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ;~~YACtF~~,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,eAAe,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,eAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAA;IACtH,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAe,EAAE,QAAgB;QAC1C,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;QACrE,IAAI,MAAqB,CAAA;QACzB,IAAI,CAAC;YACH,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;YACxE,MAAM,GAAG,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAA;QACrD,CAAC;QAAC,MAAM,CAAC;YAAC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;QAAC,CAAC;QAClD,MAAM,~~OAAO~~,GAAG,~~MAAM~~,CAAC,OAAO,CAAA;~~QAC9B~~,~~IAAI~~,OAAO,EAAE,~~YAAY~~,KAAK,~~SAAS~~,~~IAAI~~,OAAO,EAAE,~~eAAe~~,KAAK,SAAS,EAAE,CAAC;~~YAClF~~,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;YACjC,IAAI,OAAO,KAAK,KAAK;gBAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAA;YACrE,IAAI,~~CAAC,~~OAAO,CAAC,~~YAAY,~~IAAI,CAAC,~~CAAC~~,~~GAAG,OAAO,IAAI,~~CAAC,~~OAAO~~,CAAC,~~eAAe~~,~~IAAI~~,~~CAAC~~,CAAC~~,GAAG,OAAO~~;gBAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,CAAA;~~QACnI~~,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IACvC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,QAAgB,IAAmC,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAA,CAAC,CAAC;IAE1F,KAAK,CAAC,OAAO,CAAC,MAAqB,EAAE,QAAgB;QAC3D,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;QACrE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,~~QAAQ~~,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;~~QACvH~~,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAA;YAC/D,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,CAAA;QAC5C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAG,KAA2B,CAAC,IAAI,KAAK,mBAAmB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa,EAAE,CAAA;QACrH,CAAC;IACH,CAAC;CACF;IAEY,gBAAgB;sBAAS,mBAAmB~~;;;;;~~iBAA5C,gBAAiB,SAAQ,WAAmB;;;sCAEtD,MAAM;~~sCAEN~~,MAAM;~~uCAKN~~,MAAM;~~YANP~~,iLAAA,UAAU,~~6DAAkH~~;~~YAE5H~~,iLAAM,UAAU,6DAGf;YAED,oLAAM,WAAW,~~6DAGhB~~;;;~~QAZ0C~~,QAAQ,GADxC,mDAAgB;QAC3B,YAAY,GAAY,EAAmB,QAAwB;YAAI,KAAK,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAA;YAA1D,aAAQ,GAAR,QAAQ,CAAgB;QAAmC,CAAC;QAEvG,UAAU,KAA6B,OAAO,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,EAAE,CAAA,CAAC,CAAC;~~QAE5H~~,KAAK,CAAC,UAAU,CAAC,OAAe,EAAE,QAAgB;YAChD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;YAC1D,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,EAAE,GAAG,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAA;~~QAC9H~~,CAAC;QAED,KAAK,CAAC,WAAW,CAAC,QAAgB;YAChC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;YAClD,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,EAAE,GAAG,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAA;~~QAC9H~~,CAAC;;;~~SAbU~~,gBAAgB;~~AAgB7B~~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"}
1	+ {"version":3,"file":"budget-settings.js","sourceRoot":"","sources":["../../src/dsh/budget-settings.ts"],"names":[],"mappings":"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"}

package/lib/dsh/budgets.d.ts CHANGED Viewed

@@ -20,6 +20,11 @@ export interface Budgets {
 }
 export type DeletionProtectionMode = 'off' | 'relaxed' | 'strict';
 export interface Configuration {
+    readonly grillMeSkill?: boolean;
+    readonly oilUiSkill?: boolean;
+    readonly openspecSkills?: boolean;
+    readonly mattpocockSkills?: boolean;
+    readonly pstackSkills?: boolean;
     readonly windowsBash?: boolean;
     readonly windowsBashForOfficialPresets?: boolean;
     readonly applyToOfficialPresets?: boolean;

package/lib/dsh/budgets.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"budgets.d.ts","sourceRoot":"","sources":["../../src/dsh/budgets.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAC1E,OAAO,CAAC,MAAM,0BAA0B,CAAA;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAIlD,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,WAAW,CAAC;QACpB,UAAU,IAAI,CAAC,CAAC,GAAG,GAAG;YAAI,QAAQ,CAAC,EAAE,OAAO,CAAA;SAAE;KAC/C;CACF;AAED,MAAM,WAAW,OAAO;IACtB,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAA;IAC1C,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAA;IAChC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAClC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAA;IACnC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IACpC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAA;IAC9B,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAClC;AAED,MAAM,MAAM,sBAAsB,GAAG,KAAK,GAAG,SAAS,GAAG,QAAQ,CAAA;AAEjE,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAA;IAC9B,QAAQ,CAAC,6BAA6B,CAAC,EAAE,OAAO,CAAA;IAChD,QAAQ,CAAC,sBAAsB,CAAC,EAAE,OAAO,CAAA;IACzC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAA;IAC9D,QAAQ,CAAC,oCAAoC,CAAC,EAAE,OAAO,CAAA;IACvD,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAA;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAClC;AAED,eAAO,MAAM,YAAY,EAAE,CAAC,CAAC,OAAO,CASlC,CAAA;AAGF,eAAO,MAAM,2BAA2B,EAAE,CAAC,CAAC,aAAa,~~CASvD~~,CAAA;AAEF,eAAO,MAAM,mBAAmB,EAAE,CAAC,CAAC,aAAa,~~CAS~~/C,CAAA;~~AA2BF~~,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,aAAa,GAAG,aAAa,CAE1E;AAED,8FAA8F;AAC9F,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,oBAAoB,CAAC,GAAG,sBAAsB,CAGhH;AAED,kGAAkG;AAClG,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,aAAa,CAMxE;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,aAAa,CAG3E"}
1	+ {"version":3,"file":"budgets.d.ts","sourceRoot":"","sources":["../../src/dsh/budgets.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAC1E,OAAO,CAAC,MAAM,0BAA0B,CAAA;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAIlD,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,WAAW,CAAC;QACpB,UAAU,IAAI,CAAC,CAAC,GAAG,GAAG;YAAI,QAAQ,CAAC,EAAE,OAAO,CAAA;SAAE;KAC/C;CACF;AAED,MAAM,WAAW,OAAO;IACtB,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAA;IAC1C,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAA;IAChC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAClC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAA;IACnC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IACpC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAA;IAC9B,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAClC;AAED,MAAM,MAAM,sBAAsB,GAAG,KAAK,GAAG,SAAS,GAAG,QAAQ,CAAA;AAEjE,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAA;IAC/B,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAA;IAC7B,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAA;IACjC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAA;IACnC,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAA;IAC/B,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAA;IAC9B,QAAQ,CAAC,6BAA6B,CAAC,EAAE,OAAO,CAAA;IAChD,QAAQ,CAAC,sBAAsB,CAAC,EAAE,OAAO,CAAA;IACzC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAA;IAC9D,QAAQ,CAAC,oCAAoC,CAAC,EAAE,OAAO,CAAA;IACvD,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAA;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAClC;AAED,eAAO,MAAM,YAAY,EAAE,CAAC,CAAC,OAAO,CASlC,CAAA;AAGF,eAAO,MAAM,2BAA2B,EAAE,CAAC,CAAC,aAAa,CAcvD,CAAA;AAEF,eAAO,MAAM,mBAAmB,EAAE,CAAC,CAAC,aAAa,CAc/C,CAAA;AAgCF,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,aAAa,GAAG,aAAa,CAE1E;AAED,8FAA8F;AAC9F,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,oBAAoB,CAAC,GAAG,sBAAsB,CAGhH;AAED,kGAAkG;AAClG,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,aAAa,CAMxE;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,aAAa,CAG3E"}

package/lib/dsh/budgets.js CHANGED Viewed

@@ -13,6 +13,11 @@ export const budgetSchema = z.object({
 });
 // SettingsProvider resolves plain data; volatile references belong only to Loader entries.
 export const settingsConfigurationSchema = z.object({
+    grillMeSkill: z.boolean().description('Enable grill-me and its grilling dependency independently (default: off).'),
+    oilUiSkill: z.boolean().description('Enable the bundled oil-ui Skill (default: off).'),
+    openspecSkills: z.boolean().description('Enable the complete OpenSpec Skill package (default: off).'),
+    mattpocockSkills: z.boolean().description('Enable the complete Matt Pocock Skills package (default: off).'),
+    pstackSkills: z.boolean().description('Enable the complete PStack Skill package (default: off).'),
     windowsBash: z.boolean().description('Use bundled Bash for Super Code on Windows (default: on). New conversations use the saved choice.'),
     windowsBashForOfficialPresets: z.boolean().description('Also use bundled Bash for Standard, PTC and Create on Windows (default: off). Minimal keeps its persistent terminal.'),
     applyToOfficialPresets: z.boolean().description('Apply common runtime budgets to Standard, PTC, Minimal and Create presets (default: off).'),
@@ -23,6 +28,11 @@ export const settingsConfigurationSchema = z.object({
     maxContextBytes: z.number().step(1).min(1024).max(262144),
 });
 export const configurationSchema = z.object({
+    grillMeSkill: settingsConfigurationSchema.dict.grillMeSkill.extra('volatile', true),
+    oilUiSkill: settingsConfigurationSchema.dict.oilUiSkill.extra('volatile', true),
+    openspecSkills: settingsConfigurationSchema.dict.openspecSkills.extra('volatile', true),
+    mattpocockSkills: settingsConfigurationSchema.dict.mattpocockSkills.extra('volatile', true),
+    pstackSkills: settingsConfigurationSchema.dict.pstackSkills.extra('volatile', true),
     windowsBash: settingsConfigurationSchema.dict.windowsBash.extra('volatile', true),
     windowsBashForOfficialPresets: settingsConfigurationSchema.dict.windowsBashForOfficialPresets.extra('volatile', true),
     applyToOfficialPresets: settingsConfigurationSchema.dict.applyToOfficialPresets.extra('volatile', true),
@@ -33,6 +43,11 @@ export const configurationSchema = z.object({
     maxContextBytes: settingsConfigurationSchema.dict.maxContextBytes.extra('volatile', true),
 });
 const validConfiguration = json.object({
+    grillMeSkill: json.boolean().optional(),
+    oilUiSkill: json.boolean().optional(),
+    openspecSkills: json.boolean().optional(),
+    mattpocockSkills: json.boolean().optional(),
+    pstackSkills: json.boolean().optional(),
     windowsBash: json.boolean().optional(),
     windowsBashForOfficialPresets: json.boolean().optional(),
     applyToOfficialPresets: json.boolean().optional(),

package/lib/dsh/budgets.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"budgets.js","sourceRoot":"","sources":["../../src/dsh/budgets.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAC1E,OAAO,CAAC,MAAM,0BAA0B,CAAA;AAExC,OAAO,EAAE,CAAC,IAAI,IAAI,EAAE,MAAM,KAAK,CAAA;~~AAiC~~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"}
1	+ {"version":3,"file":"budgets.js","sourceRoot":"","sources":["../../src/dsh/budgets.ts"],"names":[],"mappings":"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"}

package/lib/dsh/bundled-skills.d.ts ADDED Viewed

@@ -0,0 +1,17 @@
+/** Package switches around the host's native parser, ranking and resource loader. */
+import type { Context } from '@deepseek-ai/cordis';
+import z from '@deepseek-ai/schemastery';
+export declare const name = "super-code-bundled-skills";
+export declare const inject: string[];
+export interface Config {
+    readonly bundledSkillDir: string;
+    readonly layout?: 'builtin';
+}
+export declare const Config: z<Config>;
+export declare function apply(ctx: Context, config: Config): void;
+export declare function registerBundledSkills(ctx: Context, config: Config, directory?: {
+    ready(): Promise<void>;
+    available(id: string): boolean;
+    subscribe(refresh: () => void): () => void;
+}): void;
+//# sourceMappingURL=bundled-skills.d.ts.map

package/lib/dsh/bundled-skills.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"bundled-skills.d.ts","sourceRoot":"","sources":["../../src/dsh/bundled-skills.ts"],"names":[],"mappings":"AAAA,qFAAqF;AACrF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,CAAC,MAAM,0BAA0B,CAAA;AAOxC,eAAO,MAAM,IAAI,8BAA8B,CAAA;AAC/C,eAAO,MAAM,MAAM,EAAE,MAAM,EAAyC,CAAA;AACpE,MAAM,WAAW,MAAM;IAAG,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,CAAA;CAAE;AACzF,eAAO,MAAM,MAAM,EAAE,CAAC,CAAC,MAAM,CAAsF,CAAA;AAanH,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAGxD;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAChE,SAAS,CAAC,EAAE;IAAE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAAC,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;IAAC,SAAS,CAAC,OAAO,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAA;CAAE,GAAG,IAAI,CAuD1H"}

package/lib/dsh/bundled-skills.js ADDED Viewed

@@ -0,0 +1,94 @@
+import z from '@deepseek-ai/schemastery';
+import { FileSystemSkillProvider } from '@deepseek-ai/dsh-skill-filesystem';
+import { existsSync, realpathSync } from 'node:fs';
+import { basename, dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { configurationOf } from './budgets.js';
+export const name = 'super-code-bundled-skills';
+export const inject = ['skills', 'superCodeConfiguration'];
+export const Config = z.object({ bundledSkillDir: z.string().required(), layout: z.union(['builtin']) });
+const grillSkills = new Set(['grill-me', 'grilling']);
+function legacyPackageRoot(root) {
+    if (basename(root) !== 'skills' || existsSync(root))
+        return false;
+    try {
+        return realpathSync(dirname(root)) === realpathSync(new URL('../../presets/super-code/', import.meta.url));
+    }
+    catch (error) {
+        if (['ENOENT', 'ENOTDIR'].includes(error.code ?? ''))
+            return false;
+        throw error;
+    }
+}
+export function apply(ctx, config) {
+    if (ctx.get('superCodeSkills'))
+        return;
+    registerBundledSkills(ctx, config);
+}
+export function registerBundledSkills(ctx, config, directory) {
+    let root = config.bundledSkillDir.startsWith('file:') ? fileURLToPath(config.bundledSkillDir) : config.bundledSkillDir;
+    const migrated = config.layout !== 'builtin' && legacyPackageRoot(root);
+    // Only old declarations pointing into this package follow its moved resources.
+    // User copies continue to load their own original, possibly customized files.
+    if (migrated)
+        root = fileURLToPath(new URL('../../builtin/skills/', import.meta.url));
+    const packages = config.layout === 'builtin' || migrated ? root : join(root, '../skill-packs');
+    const packs = [
+        { key: 'oilUiSkill', id: 'oil-ui', root },
+        { key: 'openspecSkills', id: 'openspec', root: join(packages, 'openspec/skills') },
+        { key: 'mattpocockSkills', id: 'mattpocock', root: join(packages, 'mattpocock/skills') },
+        { key: 'pstackSkills', id: 'pstack', root: join(packages, 'pstack/dsh/skills') },
+    ];
+    for (const pack of packs) {
+        const enabled = () => configurationOf(ctx)[pack.key] === true;
+        const grillEnabled = () => pack.id === 'mattpocock' && configurationOf(ctx).grillMeSkill === true;
+        const available = (name) => (!directory || directory.available(pack.id)) && (enabled() || grillEnabled() && grillSkills.has(name));
+        ctx.skills.registerProvider(control => {
+            const provider = new FileSystemSkillProvider(ctx, control, {
+                providerName: `super-code-bundled-${pack.id}`, bundledSkillDir: pack.root,
+                includeDefaultRoots: false, watch: false,
+            });
+            let previous = [enabled(), grillEnabled()].join();
+            const refresh = () => {
+                const next = [enabled(), grillEnabled()].join();
+                if (next !== previous) {
+                    previous = next;
+                    control.invalidate();
+                }
+            };
+            // Legacy providers announce a document revision before committing its
+            // resolved value; SettingsForms announces it after updating live fields.
+            ctx.on('settings/updated', refresh);
+            ctx.on('settings/document-updated', refresh);
+            if (directory)
+                ctx.effect(() => directory.subscribe(control.invalidate));
+            ctx.effect(() => () => provider.dispose());
+            return {
+                name: provider.name,
+                list: async (options) => {
+                    await directory?.ready();
+                    if ((!enabled() && !grillEnabled()) || directory && !directory.available(pack.id) || control.signal.aborted)
+                        return [];
+                    const catalog = await provider.list(options);
+                    if (control.signal.aborted)
+                        return [];
+                    if (enabled())
+                        return catalog;
+                    if (!grillEnabled())
+                        return [];
+                    return Array.isArray(catalog) ? catalog.filter(candidate => grillSkills.has(candidate.name))
+                        : { ...catalog, candidates: catalog.candidates.filter(candidate => grillSkills.has(candidate.name)) };
+                },
+                // Recheck at load time too: a caller may hold a catalog from before a switch.
+                get: async (candidate, options) => {
+                    await directory?.ready();
+                    if (!available(candidate.name) || control.signal.aborted)
+                        return undefined;
+                    const skill = await provider.get(candidate, options);
+                    return available(candidate.name) && !control.signal.aborted ? skill : undefined;
+                },
+            };
+        });
+    }
+}
+//# sourceMappingURL=bundled-skills.js.map

package/lib/dsh/bundled-skills.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"bundled-skills.js","sourceRoot":"","sources":["../../src/dsh/bundled-skills.ts"],"names":[],"mappings":"AAEA,OAAO,CAAC,MAAM,0BAA0B,CAAA;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAA;AAC3E,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAE9C,MAAM,CAAC,MAAM,IAAI,GAAG,2BAA2B,CAAA;AAC/C,MAAM,CAAC,MAAM,MAAM,GAAa,CAAC,QAAQ,EAAE,wBAAwB,CAAC,CAAA;AAEpE,MAAM,CAAC,MAAM,MAAM,GAAc,CAAC,CAAC,MAAM,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAA;AACnH,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAA;AAErD,SAAS,iBAAiB,CAAC,IAAY;IACrC,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,QAAQ,IAAI,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAA;IACjE,IAAI,CAAC;QACH,OAAO,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,YAAY,CAAC,IAAI,GAAG,CAAC,2BAA2B,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;IAC5G,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAE,KAA+B,CAAC,IAAI,IAAI,EAAE,CAAC;YAAE,OAAO,KAAK,CAAA;QAC7F,MAAM,KAAK,CAAA;IACb,CAAC;AACH,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,GAAY,EAAE,MAAc;IAChD,IAAI,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC;QAAE,OAAM;IACtC,qBAAqB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;AACpC,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,GAAY,EAAE,MAAc,EAChE,SAAkH;IAClH,IAAI,IAAI,GAAG,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAA;IACtH,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAA;IACvE,+EAA+E;IAC/E,8EAA8E;IAC9E,IAAI,QAAQ;QAAE,IAAI,GAAG,aAAa,CAAC,IAAI,GAAG,CAAC,uBAAuB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;IACrF,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAA;IAC9F,MAAM,KAAK,GAAG;QACZ,EAAE,GAAG,EAAE,YAAY,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;QACzC,EAAE,GAAG,EAAE,gBAAgB,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,iBAAiB,CAAC,EAAE;QAClF,EAAE,GAAG,EAAE,kBAAkB,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,EAAE;QACxF,EAAE,GAAG,EAAE,cAAc,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,EAAE;KACxE,CAAA;IACV,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,OAAO,GAAG,GAAY,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,CAAA;QACtE,MAAM,YAAY,GAAG,GAAY,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,YAAY,IAAI,eAAe,CAAC,GAAG,CAAC,CAAC,YAAY,KAAK,IAAI,CAAA;QAC1G,MAAM,SAAS,GAAG,CAAC,IAAY,EAAW,EAAE,CAAC,CAAC,CAAC,SAAS,IAAI,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,YAAY,EAAE,IAAI,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAA;QACnJ,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE;YACpC,MAAM,QAAQ,GAAG,IAAI,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE;gBACzD,YAAY,EAAE,sBAAsB,IAAI,CAAC,EAAE,EAAE,EAAE,eAAe,EAAE,IAAI,CAAC,IAAI;gBACzE,mBAAmB,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;aACzC,CAAC,CAAA;YACF,IAAI,QAAQ,GAAG,CAAC,OAAO,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;YACjD,MAAM,OAAO,GAAG,GAAS,EAAE;gBACzB,MAAM,IAAI,GAAG,CAAC,OAAO,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;gBAC/C,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAAC,QAAQ,GAAG,IAAI,CAAC;oBAAC,OAAO,CAAC,UAAU,EAAE,CAAA;gBAAC,CAAC;YAClE,CAAC,CAAA;YACD,sEAAsE;YACtE,yEAAyE;YACzE,GAAG,CAAC,EAAE,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;YACnC,GAAG,CAAC,EAAE,CAAC,2BAA2B,EAAE,OAAO,CAAC,CAAA;YAC5C,IAAI,SAAS;gBAAE,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAA;YACxE,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAA;YAC1C,OAAO;gBACL,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,IAAI,EAAE,KAAK,EAAC,OAAO,EAAC,EAAE;oBACpB,MAAM,SAAS,EAAE,KAAK,EAAE,CAAA;oBACxB,IAAI,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,IAAI,SAAS,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO;wBAAE,OAAO,EAAE,CAAA;oBACtH,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;oBAC5C,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO;wBAAE,OAAO,EAAE,CAAA;oBACrC,IAAI,OAAO,EAAE;wBAAE,OAAO,OAAO,CAAA;oBAC7B,IAAI,CAAC,YAAY,EAAE;wBAAE,OAAO,EAAE,CAAA;oBAC9B,OAAO,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;wBAC1F,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,CAAA;gBACzG,CAAC;gBACD,8EAA8E;gBAC9E,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE;oBAChC,MAAM,SAAS,EAAE,KAAK,EAAE,CAAA;oBACxB,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO;wBAAE,OAAO,SAAS,CAAA;oBAC1E,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;oBACpD,OAAO,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA;gBACjF,CAAC;aACF,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;AACH,CAAC"}

package/lib/dsh/compaction.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../../src/dsh/compaction.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAA;AACzE,OAAO,EAAE,gBAAgB,EAA6B,MAAM,6BAA6B,CAAA;AAEzF,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AACtF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAA;AAChE,OAAO,EAAE,YAAY,EAA0C,MAAM,cAAc,CAAA;AACnF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAE3C,eAAO,MAAM,IAAI,0BAA0B,CAAA;AAC3C,eAAO,MAAM,MAAM,EAAE,SAAS,MAAM,EAAsC,CAAA;AAC1E,eAAO,MAAM,MAAM,EAAE,OAAO,YAA2B,CAAA;AAEvD,yFAAyF;AACzF,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,UAAU,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAajK;AAED,qBAAa,sBAAuB,SAAQ,qBAAqB;IACrC,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAtC,GAAG,EAAE,OAAO,EAAmB,OAAO,GAAE,OAAY;IAWjD,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;CAIhI;AAED,sGAAsG;AACtG,wBAAsB,eAAe,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,~~CAyB1J~~;AAED,4FAA4F;AAC5F,qBAAa,qBAAsB,SAAQ,gBAAgB;IAG/B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAFpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8G;gBAE1H,GAAG,EAAE,OAAO,EAAmB,SAAS,GAAE,OAAY;IAwBlE,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAqBxC,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAIhH,aAAa,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAIhH,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,eAAe,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;CAG5H;AAED,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,GAAE,OAAY,GAAG,IAAI,CAE9D"}
1	+ {"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../../src/dsh/compaction.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAA;AACzE,OAAO,EAAE,gBAAgB,EAA6B,MAAM,6BAA6B,CAAA;AAEzF,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AACtF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAA;AAChE,OAAO,EAAE,YAAY,EAA0C,MAAM,cAAc,CAAA;AACnF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAE3C,eAAO,MAAM,IAAI,0BAA0B,CAAA;AAC3C,eAAO,MAAM,MAAM,EAAE,SAAS,MAAM,EAAsC,CAAA;AAC1E,eAAO,MAAM,MAAM,EAAE,OAAO,YAA2B,CAAA;AAEvD,yFAAyF;AACzF,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,UAAU,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAajK;AAED,qBAAa,sBAAuB,SAAQ,qBAAqB;IACrC,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAtC,GAAG,EAAE,OAAO,EAAmB,OAAO,GAAE,OAAY;IAWjD,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;CAIhI;AAED,sGAAsG;AACtG,wBAAsB,eAAe,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CA0B1J;AAED,4FAA4F;AAC5F,qBAAa,qBAAsB,SAAQ,gBAAgB;IAG/B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAFpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8G;gBAE1H,GAAG,EAAE,OAAO,EAAmB,SAAS,GAAE,OAAY;IAwBlE,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAqBxC,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAIhH,aAAa,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAIhH,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,eAAe,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;CAG5H;AAED,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,GAAE,OAAY,GAAG,IAAI,CAE9D"}

package/lib/dsh/compaction.js CHANGED Viewed

@@ -51,6 +51,7 @@ export async function compactByWindow(engine, budgets, agent, signal) {
     if (!config?.provider || !config.model)
         return null;
     const info = await ctx.llm.resolveModelInfo(config.provider, config.model, signal);
+    signal.throwIfAborted();
     const window = info.context?.contextWindow;
     if (!Number.isSafeInteger(window) || !window || window < 1)
         throw new Error('Compression requires the routed model context window');

package/lib/dsh/compaction.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"compaction.js","sourceRoot":"","sources":["../../src/dsh/compaction.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"compaction.js","sourceRoot":"","sources":["../../src/dsh/compaction.ts"],"names":[],"mappings":"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"}

package/lib/dsh/connection-approval.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"connection-approval.d.ts","sourceRoot":"","sources":["../../src/dsh/connection-approval.ts"],"names":[],"mappings":"AAAA,gGAAgG;AAChG,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAIlD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;~~AAajE~~,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,GAAG,KAAK,GAAG,IAAI,~~CA2CpG~~"}
1	+ {"version":3,"file":"connection-approval.d.ts","sourceRoot":"","sources":["../../src/dsh/connection-approval.ts"],"names":[],"mappings":"AAAA,gGAAgG;AAChG,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAIlD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAcjE,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,GAAG,KAAK,GAAG,IAAI,CA2DpG"}

package/lib/dsh/connection-approval.js CHANGED Viewed

@@ -1,4 +1,5 @@
 import { scopeChainOf } from '@deepseek-ai/dsh-scope';
+import { recordedToolResult } from '../core/host-messages.js';
 function serializedArguments(value) {
     try {
         const text = JSON.stringify(value);
@@ -33,8 +34,22 @@ export function applyConnectionApproval(ctx, current) {
         if (!service || !service.read().configuration.allowCallerApproval)
             return next();
         const roots = scopeChainOf(request.agent).flatMap(key => {
-            const id = key.session?.id;
-            return typeof id === 'string' ? [id] : [];
+            const session = key.session;
+            if (!session)
+                return [];
+            const events = session.ownEvents(), requestIds = [];
+            // A session can be reused manually; only its latest admitted turn carries caller authority.
+            for (let index = events.length - 1; index >= 0; index--) {
+                const event = events[index];
+                if (event.type === 'turn/start')
+                    break;
+                if (event.type === 'user/message') {
+                    const source = event.data.source;
+                    if (source?.kind === 'user' && 'rpcId' in source && typeof source.rpcId === 'string')
+                        requestIds.push(source.rpcId);
+                }
+            }
+            return [{ sessionId: session.id, requestIds }];
         });
         // A seed parentSession alone does not authorize a fork. Only the live scope ancestry counts.
         let argumentsText = '';
@@ -52,6 +67,13 @@ export function applyConnectionApproval(ctx, current) {
                 let found = false;
                 for (let index = events.length - 1; index >= 0; index--) {
                     const event = events[index];
+                    if (event.type === 'turn/start')
+                        break;
+                    if (event.type === 'tool/result') {
+                        const result = recordedToolResult(event.data.message);
+                        if (result.kind === 'record' && result.callId === request.callId)
+                            break;
+                    }
                     if (event.type === 'tool/call' && event.data.callId === request.callId && event.data.name === request.toolName) {
                         argumentsText = event.data.arguments;
                         found = true;

package/lib/dsh/connection-approval.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"connection-approval.js","sourceRoot":"","sources":["../../src/dsh/connection-approval.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;~~AASrD~~,SAAS,mBAAmB,CAAC,KAAc;IACzC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;QAClC,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAA;IACxE,CAAC;IAAC,MAAM,CAAC;QAAC,OAAO,KAAK,CAAA;IAAC,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,GAAY,EAAE,OAAwC;IAC5F,MAAM,MAAM,GAAG,IAAI,OAAO,EAA0B,CAAA;IACpD,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,EAAE;QAC5B,KAAK,CAAC,EAAE,CAAC,eAAe,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;YAC7C,IAAI,CAAC,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAI,EAAE,CAAA;YAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,GAAG,EAAc,CAAA;YAC5E,MAAM,IAAI,GAAe,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAA;YACrH,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YACzC,IAAI,CAAC;gBAAC,OAAO,MAAM,IAAI,EAAE,CAAA;YAAC,CAAC;oBACnB,CAAC;gBAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAAC,IAAI,CAAC,KAAK,CAAC,IAAI;oBAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YAAC,CAAC;QACvE,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;IACvB,CAAC,CAAC,CAAA;IACF,GAAG,CAAC,EAAE,CAAC,kBAAkB,EAAE,KAAK,EAAE,OAAwB,EAAE,IAAoC,EAA4B,EAAE;QAC5H,MAAM,OAAO,GAAG,OAAO,EAAE,CAAA;QACzB,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,aAAa,CAAC,mBAAmB;YAAE,OAAO,IAAI,EAAE,CAAA;QAChF,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACtD,MAAM,~~EAAE~~,GAAI,GAAsB,CAAC,OAAO,EAAE,EAAE,CAAA;~~YAC9C~~,OAAO,OAAO,~~EAAE~~,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,~~EAAE~~,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;~~QAC3C~~,CAAC,CAAC,CAAA;QACF,6FAA6F;QAC7F,IAAI,aAAa,GAAG,EAAE,CAAA;QACtB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,qEAAqE;YACrE,qEAAqE;YACrE,MAAM,KAAK,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;YACvI,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;gBACjB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,CAAC,CAAE,CAAC,SAAS,KAAK,KAAK;oBAAE,OAAO,IAAI,EAAE,CAAA;gBACtE,aAAa,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC,SAAS,CAAA;YACrC,CAAC;iBAAM,CAAC;gBACN,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,CAAA;gBAChD,IAAI,KAAK,GAAG,KAAK,CAAA;gBACjB,KAAK,IAAI,KAAK,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;oBACxD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAE,CAAA;oBAC5B,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC;wBAAC,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;wBAAC,KAAK,GAAG,IAAI,CAAC;wBAAC,MAAK;oBAAC,CAAC;gBAC/K,CAAC;gBACD,IAAI,CAAC,KAAK;oBAAE,OAAO,IAAI,EAAE,CAAA;YAC3B,CAAC;QACH,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC5G,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;QACzI,IAAI,OAAO,CAAC,MAAM,EAAE,OAAO;YAAE,OAAO,WAAW,CAAA;QAC/C,OAAO,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAA;IAC5C,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;AACvB,CAAC"}
1	+ {"version":3,"file":"connection-approval.js","sourceRoot":"","sources":["../../src/dsh/connection-approval.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAKrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAK7D,SAAS,mBAAmB,CAAC,KAAc;IACzC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;QAClC,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAA;IACxE,CAAC;IAAC,MAAM,CAAC;QAAC,OAAO,KAAK,CAAA;IAAC,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,GAAY,EAAE,OAAwC;IAC5F,MAAM,MAAM,GAAG,IAAI,OAAO,EAA0B,CAAA;IACpD,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,EAAE;QAC5B,KAAK,CAAC,EAAE,CAAC,eAAe,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;YAC7C,IAAI,CAAC,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAI,EAAE,CAAA;YAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,GAAG,EAAc,CAAA;YAC5E,MAAM,IAAI,GAAe,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAA;YACrH,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YACzC,IAAI,CAAC;gBAAC,OAAO,MAAM,IAAI,EAAE,CAAA;YAAC,CAAC;oBACnB,CAAC;gBAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAAC,IAAI,CAAC,KAAK,CAAC,IAAI;oBAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YAAC,CAAC;QACvE,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;IACvB,CAAC,CAAC,CAAA;IACF,GAAG,CAAC,EAAE,CAAC,kBAAkB,EAAE,KAAK,EAAE,OAAwB,EAAE,IAAoC,EAA4B,EAAE;QAC5H,MAAM,OAAO,GAAG,OAAO,EAAE,CAAA;QACzB,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,aAAa,CAAC,mBAAmB;YAAE,OAAO,IAAI,EAAE,CAAA;QAChF,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACtD,MAAM,OAAO,GAAI,GAAsB,CAAC,OAAO,CAAA;YAC/C,IAAI,CAAC,OAAO;gBAAE,OAAO,EAAE,CAAA;YACvB,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,EAAE,UAAU,GAAa,EAAE,CAAA;YAC7D,4FAA4F;YAC5F,KAAK,IAAI,KAAK,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;gBACxD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAE,CAAA;gBAC5B,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY;oBAAE,MAAK;gBACtC,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;oBAClC,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAA;oBAChC,IAAI,MAAM,EAAE,IAAI,KAAK,MAAM,IAAI,OAAO,IAAI,MAAM,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ;wBAAE,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBACrH,CAAC;YACH,CAAC;YACD,OAAO,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,UAAU,EAAE,CAAC,CAAA;QAChD,CAAC,CAAC,CAAA;QACF,6FAA6F;QAC7F,IAAI,aAAa,GAAG,EAAE,CAAA;QACtB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,qEAAqE;YACrE,qEAAqE;YACrE,MAAM,KAAK,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;YACvI,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;gBACjB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,CAAC,CAAE,CAAC,SAAS,KAAK,KAAK;oBAAE,OAAO,IAAI,EAAE,CAAA;gBACtE,aAAa,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC,SAAS,CAAA;YACrC,CAAC;iBAAM,CAAC;gBACN,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,CAAA;gBAChD,IAAI,KAAK,GAAG,KAAK,CAAA;gBACjB,KAAK,IAAI,KAAK,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;oBACxD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAE,CAAA;oBAC5B,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY;wBAAE,MAAK;oBACtC,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;wBACjC,MAAM,MAAM,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;wBACrD,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM;4BAAE,MAAK;oBACzE,CAAC;oBACD,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC;wBAAC,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;wBAAC,KAAK,GAAG,IAAI,CAAC;wBAAC,MAAK;oBAAC,CAAC;gBAC/K,CAAC;gBACD,IAAI,CAAC,KAAK;oBAAE,OAAO,IAAI,EAAE,CAAA;YAC3B,CAAC;QACH,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC5G,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;QACzI,IAAI,OAAO,CAAC,MAAM,EAAE,OAAO;YAAE,OAAO,WAAW,CAAA;QAC/C,OAAO,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAA;IAC5C,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;AACvB,CAAC"}

package/lib/dsh/connection-history.d.ts CHANGED Viewed

@@ -2,5 +2,6 @@
 import type { SessionEvent } from '@deepseek-ai/dsh-session';
 import type { HistoryCursor, HistoryPage } from '../connection/types.js';
 export declare function publicMessageText(content: unknown): string;
-export declare function connectionHistoryPage(events: readonly SessionEvent[], cursor: HistoryCursor, limit: number): HistoryPage;
+/** Host journals are ordered by seq; start skips inherited events without copying them. */
+export declare function connectionHistoryPage(events: readonly SessionEvent[], cursor: HistoryCursor, limit: number, start?: number): HistoryPage;
 //# sourceMappingURL=connection-history.d.ts.map

package/lib/dsh/connection-history.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"connection-history.d.ts","sourceRoot":"","sources":["../../src/dsh/connection-history.ts"],"names":[],"mappings":"AAAA,oGAAoG;AACpG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAG5D,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAExE,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAE1D;~~AAiBD~~,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,GAAG,WAAW,~~CAuBxH~~"}
1	+ {"version":3,"file":"connection-history.d.ts","sourceRoot":"","sources":["../../src/dsh/connection-history.ts"],"names":[],"mappings":"AAAA,oGAAoG;AACpG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAG5D,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAExE,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAE1D;AA4BD,2FAA2F;AAC3F,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,SAAI,GAAG,WAAW,CA6BnI"}

package/lib/dsh/connection-history.js CHANGED Viewed

@@ -7,8 +7,20 @@ function publicEvent(event) {
     const data = event.data, type = event.type;
     switch (type) {
         case 'assistant/message': return { text: publicMessageText(data.message?.content ?? data.content) };
-        case 'user/message': return { text: publicMessageText(data.content ?? data.message?.content) };
+        case 'user/message': {
+            // Runtime snapshots use the user role too; identify their producer rather
+            // than filtering text that an actual user may legitimately have written.
+            const source = data.source ?? data.message?.source;
+            if (source?.kind === 'runtime-context' || source?.kind === 'system-prompt'
+                || source?.kind === 'plugin:@deepseek-ai/dsh-system-prompt'
+                || source?.kind === 'plugin' && source.plugin === '@deepseek-ai/dsh-system-prompt')
+                return { text: '' };
+            return { text: publicMessageText(data.content ?? data.message?.content) };
+        }
         case 'tool/call': return { text: `${data.name ?? 'tool'}\n${typeof data.arguments === 'string' ? data.arguments : ''}` };
+        // PTC records already contain decoded arguments and public outcome blocks.
+        case 'tool/ptc-dispatch-start': return { text: `${data.name}\n${JSON.stringify(data.arguments)}` };
+        case 'tool/ptc-dispatch': return { text: `${data.name}\n${publicMessageText(data.content)}`, isError: data.isError === true };
         case 'tool/result': {
             const result = recordedToolResult(data.message);
             return result.kind === 'record' ? { text: result.texts.join('\n'), isError: result.isError } : { text: '[Tool result layout unavailable]' };
@@ -19,12 +31,21 @@ function publicEvent(event) {
         default: return { text: '' };
     }
 }
-export function connectionHistoryPage(events, cursor, limit) {
+/** Host journals are ordered by seq; start skips inherited events without copying them. */
+export function connectionHistoryPage(events, cursor, limit, start = 0) {
     if (!Number.isSafeInteger(cursor.seq) || cursor.seq < 0 || !Number.isSafeInteger(cursor.offset) || cursor.offset < 0 || !Number.isInteger(limit) || limit < 1 || limit > 20)
         throw new ConnectionError('invalid-history-cursor');
     const entries = [];
-    let index = events.findIndex(event => event.seq >= cursor.seq), nextCursor = { ...cursor }, chars = 0, scanned = 0;
-    if (index < 0) {
+    let low = start, high = events.length;
+    while (low < high) {
+        const middle = low + Math.floor((high - low) / 2);
+        if (events[middle].seq < cursor.seq)
+            low = middle + 1;
+        else
+            high = middle;
+    }
+    let index = low, nextCursor = { ...cursor }, chars = 0, scanned = 0;
+    if (index === events.length) {
         if (cursor.offset)
             throw new ConnectionError('invalid-history-cursor');
         return { entries, nextCursor, hasMore: false, scope: 'own-public-events' };

package/lib/dsh/connection-history.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"connection-history.js","sourceRoot":"","sources":["../../src/dsh/connection-history.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAGxD,MAAM,UAAU,iBAAiB,CAAC,OAAgB;IAChD,OAAO,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,MAAM,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;AAC5J,CAAC;AACD,SAAS,WAAW,CAAC,KAAmB;IACtC,MAAM,IAAI,GAAG,KAAK,CAAC,IAA2B,EAAE,IAAI,GAAW,KAAK,CAAC,IAAI,CAAA;IACzE,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,mBAAmB,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,iBAAiB,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAA;QACnG,KAAK,cAAc,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,iBAAiB,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAA;~~QAC9F~~,KAAK,WAAW,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,IAAI,IAAI,MAAM,KAAK,OAAO,IAAI,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAA;QACxH,KAAK,aAAa,CAAC,CAAC,CAAC;YACnB,MAAM,MAAM,GAAG,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAC/C,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,kCAAkC,EAAE,CAAA;QAC7I,CAAC;QACD,KAAK,UAAU,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,SAAS,EAAE,GAAG,CAAC,OAAO,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAA;QAC1M,KAAK,gBAAgB,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,oCAAoC,EAAE,CAAA;QAC5E,KAAK,kBAAkB,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,4BAA4B,EAAE,CAAA;QACtE,OAAO,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAA;IAC9B,CAAC;AACH,CAAC;AACD,MAAM,UAAU,qBAAqB,CAAC,MAA+B,EAAE,MAAqB,EAAE,KAAa;~~IACzG~~,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE;QAAE,MAAM,IAAI,eAAe,CAAC,wBAAwB,CAAC,CAAA;IAChO,MAAM,OAAO,GAA2B,EAAE,CAAA;IAC1C,IAAI,KAAK,GAAG,MAAM,CAAC,~~SAAS~~,~~CAAC~~,~~KAAK~~,~~CAAC~~,EAAE,CAAC,KAAK,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,EAAE,UAAU,GAAG,EAAE,GAAG,MAAM,EAAE,EAAE,KAAK,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,CAAA;~~IAClH~~,IAAI,KAAK,~~GAAG~~,CAAC,EAAE,CAAC;~~QACd~~,IAAI,MAAM,CAAC,MAAM;YAAE,MAAM,IAAI,eAAe,CAAC,wBAAwB,CAAC,CAAA;QACtE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAA;IAC5E,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,KAAK,CAAE,CAAC,GAAG,KAAK,MAAM,CAAC,GAAG;QAAE,MAAM,IAAI,eAAe,CAAC,wBAAwB,CAAC,CAAA;IAC3G,OAAO,KAAK,GAAG,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,GAAG,KAAK,IAAI,KAAK,GAAG,KAAK,IAAI,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC;QAC5F,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAE,EAAE,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,GAAG,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;QACjH,IAAI,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,MAAM,GAAG,CAAC,IAAI,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC,IAAI,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAE,CAAC;YAAE,MAAM,IAAI,eAAe,CAAC,wBAAwB,CAAC,CAAA;QACzM,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,GAAG,KAAK,CAAC,CAAC,CAAA;QAC/E,IAAI,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAE,CAAC;YAAE,GAAG,EAAE,CAAA;QACtF,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC;YACjC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAA;YAC1M,KAAK,IAAI,GAAG,GAAG,MAAM,CAAA;QACvB,CAAC;QACD,UAAU,GAAG,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAA;QAC5G,IAAI,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM;YAAE,MAAK;QACpC,KAAK,EAAE,CAAA;IACT,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAA;AAC5F,CAAC"}
1	+ {"version":3,"file":"connection-history.js","sourceRoot":"","sources":["../../src/dsh/connection-history.ts"],"names":[],"mappings":"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"}