@qvac/harness 0.3.3 → 0.5.0

package/dist-lib/lib/tools/skills/manifest-parse.js

@@ -1,48 +1,55 @@
+import { isRecord } from '../../guards.js';
 export function parseManifestBlock(block, key = 'metadata') {
     const json = extractJsonBlock(block, key);
-    if (!isObj(json) || !isObj(json.openclaw))
+    if (!isObj(json) || !isObj(json.openclaw)) {
         return {};
+    }
     const oc = json.openclaw;
     const requires = readRequires(oc.requires);
     const install = readInstall(oc.install);
     const setup = readSetup(oc.setup);
     return {
-        ...(requires ? { requires } : {}),
-        ...(install ? { install } : {}),
-        ...(setup ? { setup } : {}),
-        ...(typeof oc.stub === 'boolean' ? { stub: oc.stub } : {}),
-        ...(typeof oc.minCapabilityProfile === 'string'
-            ? { minCapabilityProfile: oc.minCapabilityProfile }
-            : {}),
-        ...(typeof oc.emoji === 'string' ? { emoji: oc.emoji } : {})
+        requires,
+        install,
+        setup,
+        stub: typeof oc.stub === 'boolean' ? oc.stub : undefined,
+        minCapabilityProfile: typeof oc.minCapabilityProfile === 'string' ? oc.minCapabilityProfile : undefined,
+        emoji: typeof oc.emoji === 'string' ? oc.emoji : undefined
     };
 }
 function extractJsonBlock(block, key) {
     const at = block.indexOf(`${key}:`);
-    if (at === -1)
+    if (at === -1) {
         return null;
+    }
     const rest = block.slice(at + key.length + 1);
     const start = rest.indexOf('{');
-    if (start === -1)
+    if (start === -1) {
         return null;
+    }
     let depth = 0;
     let inString = false;
     let escaped = false;
     for (let i = start; i < rest.length; i++) {
         const ch = rest[i];
         if (inString) {
-            if (escaped)
+            if (escaped) {
                 escaped = false;
-            else if (ch === '\\')
+            }
+            else if (ch === '\\') {
                 escaped = true;
-            else if (ch === '"')
+            }
+            else if (ch === '"') {
                 inString = false;
+            }
             continue;
         }
-        if (ch === '"')
+        if (ch === '"') {
             inString = true;
-        else if (ch === '{')
+        }
+        else if (ch === '{') {
             depth++;
+        }
         else if (ch === '}' && --depth === 0) {
             try {
                 return JSON.parse(rest.slice(start, i + 1));
@@ -54,8 +61,13 @@ function extractJsonBlock(block, key) {
     }
     return null;
 }
+function verifyBody(body) {
+    if (typeof body === 'string')
+        return body;
+    return isObj(body) ? JSON.stringify(body) : undefined;
+}
 function isObj(v) {
-    return typeof v === 'object' && v !== null && !Array.isArray(v);
+    return isRecord(v) && !Array.isArray(v);
 }
 function strArr(v) {
     if (!Array.isArray(v))
@@ -71,10 +83,10 @@ function readRequires(v) {
     const credentialChecks = readCredentialChecks(v.credentialChecks);
     return bins || mins || credentials || credentialChecks
         ? {
-            ...(bins ? { bins } : {}),
-            ...(mins ? { binMinVersions: mins } : {}),
-            ...(credentials ? { credentials } : {}),
-            ...(credentialChecks ? { credentialChecks } : {})
+            bins,
+            binMinVersions: mins,
+            credentials,
+            credentialChecks
         }
         : undefined;
 }
@@ -87,7 +99,7 @@ function readBinMinVersions(v) {
             continue;
         out[bin] = {
             min: spec.min,
-            ...(typeof spec.command === 'string' ? { command: spec.command } : {})
+            command: typeof spec.command === 'string' ? spec.command : undefined
         };
     }
     return Object.keys(out).length > 0 ? out : undefined;
@@ -102,8 +114,8 @@ function readCredentialChecks(v) {
         const headers = readStringRecord(check.headers);
         out[key] = {
             url: check.url,
-            ...(typeof check.method === 'string' ? { method: check.method } : {}),
-            ...(headers && Object.keys(headers).length > 0 ? { headers } : {})
+            method: typeof check.method === 'string' ? check.method : undefined,
+            headers
         };
     }
     return Object.keys(out).length > 0 ? out : undefined;
@@ -113,8 +125,9 @@ function readStringRecord(v) {
         return undefined;
     const out = {};
     for (const [key, value] of Object.entries(v)) {
-        if (typeof value === 'string')
+        if (typeof value === 'string') {
             out[key] = value;
+        }
     }
     return Object.keys(out).length > 0 ? out : undefined;
 }
@@ -134,10 +147,10 @@ export function readInstall(v) {
             id: raw.id,
             kind: raw.kind,
             label: raw.label,
-            ...(typeof raw.formula === 'string' ? { formula: raw.formula } : {}),
-            ...(bins ? { bins } : {}),
-            ...(typeof raw.command === 'string' ? { command: raw.command } : {}),
-            ...(typeof raw.manual === 'boolean' ? { manual: raw.manual } : {})
+            formula: typeof raw.formula === 'string' ? raw.formula : undefined,
+            bins,
+            command: typeof raw.command === 'string' ? raw.command : undefined,
+            manual: typeof raw.manual === 'boolean' ? raw.manual : undefined
         });
     }
     return steps.length > 0 ? steps : undefined;
@@ -151,35 +164,35 @@ export function readSetup(v) {
         return undefined;
     const summary = typeof v.summary === 'string' ? v.summary : undefined;
     const routes = readRoutes(v.routes);
-    return summary || routes
-        ? { ...(summary ? { summary } : {}), ...(routes ? { routes } : {}) }
-        : undefined;
+    return summary || routes ? { summary: summary || undefined, routes } : undefined;
 }
 function readRoutes(v) {
     if (!Array.isArray(v))
         return undefined;
     const routes = [];
     for (const raw of v) {
-        if (!isObj(raw) || !isRouteKind(raw.kind) || typeof raw.label !== 'string')
+        if (!isObj(raw) || !isRouteKind(raw.kind) || typeof raw.label !== 'string') {
             continue;
+        }
         const steps = strArr(raw.steps);
         const configSteps = strArr(raw.configSteps);
         const fields = readFields(raw.fields);
         const oauth = readOAuth(raw.oauth);
-        if (raw.kind === 'oauth' && !oauth)
+        if (raw.kind === 'oauth' && !oauth) {
             continue;
+        }
         routes.push({
             kind: raw.kind,
             label: raw.label,
-            ...(typeof raw.provider === 'string' ? { provider: raw.provider } : {}),
-            ...(typeof raw.credentialKey === 'string' ? { credentialKey: raw.credentialKey } : {}),
-            ...(typeof raw.description === 'string' ? { description: raw.description } : {}),
-            ...(typeof raw.helpUrl === 'string' ? { helpUrl: raw.helpUrl } : {}),
-            ...(steps ? { steps } : {}),
-            ...(configSteps ? { configSteps } : {}),
-            ...(fields ? { fields } : {}),
-            ...(typeof raw.satisfied === 'boolean' ? { satisfied: raw.satisfied } : {}),
-            ...(oauth ? { oauth } : {})
+            provider: typeof raw.provider === 'string' ? raw.provider : undefined,
+            credentialKey: typeof raw.credentialKey === 'string' ? raw.credentialKey : undefined,
+            description: typeof raw.description === 'string' ? raw.description : undefined,
+            helpUrl: typeof raw.helpUrl === 'string' ? raw.helpUrl : undefined,
+            steps,
+            configSteps,
+            fields,
+            satisfied: typeof raw.satisfied === 'boolean' ? raw.satisfied : undefined,
+            oauth
         });
     }
     return routes.length > 0 ? routes : undefined;
@@ -218,8 +231,9 @@ function readAuthParams(v) {
             : []))
         : v;
     const record = readStringRecord(raw);
-    if (!record)
+    if (!record) {
         return undefined;
+    }
     const out = Object.fromEntries(Object.entries(record).filter(([key]) => !OAUTH_RESERVED_PARAMS.has(key)));
     return Object.keys(out).length > 0 ? out : undefined;
 }
@@ -228,38 +242,42 @@ function siteOf(url) {
     return new URL(url).hostname.split('.').slice(-2).join('.');
 }
 function readVerifyRule(v) {
-    if (!isObj(v) || typeof v.error !== 'string' || !OAUTH_ERROR_CODE.test(v.error))
+    if (!isObj(v) || typeof v.error !== 'string' || !OAUTH_ERROR_CODE.test(v.error)) {
         return undefined;
+    }
     const status = Array.isArray(v.status)
         ? v.status.filter((s) => Number.isInteger(s) && s >= 100 && s < 600)
         : [];
     const field = typeof v.field === 'string' && v.field.length > 0 ? v.field : undefined;
-    if (status.length === 0 && !field)
+    if (status.length === 0 && !field) {
         return undefined;
+    }
     return {
         error: v.error,
-        ...(status.length > 0 ? { status } : {}),
-        ...(field ? { field } : {}),
-        ...(field && typeof v.notEqual === 'string' ? { notEqual: v.notEqual } : {})
+        status: status.length > 0 ? status : undefined,
+        field,
+        notEqual: field && typeof v.notEqual === 'string' ? v.notEqual : undefined
     };
 }
 function readVerify(v, tokenUrl) {
     if (!isObj(v))
         return undefined;
     const url = httpsUrl(v.url);
-    if (!url || siteOf(url) !== siteOf(tokenUrl))
+    if (!url || siteOf(url) !== siteOf(tokenUrl)) {
         return undefined;
+    }
     if (v.method !== undefined && v.method !== null && v.method !== 'GET' && v.method !== 'POST') {
         return undefined;
     }
     const reject = Array.isArray(v.reject) ? v.reject.flatMap((r) => readVerifyRule(r) ?? []) : [];
-    if (reject.length === 0)
+    if (reject.length === 0) {
         return undefined;
-    const body = typeof v.body === 'string' ? v.body : isObj(v.body) ? JSON.stringify(v.body) : undefined;
+    }
+    const body = verifyBody(v.body);
     return {
         url,
-        ...(v.method === 'GET' || v.method === 'POST' ? { method: v.method } : {}),
-        ...(body !== undefined ? { body } : {}),
+        method: v.method === 'GET' || v.method === 'POST' ? v.method : undefined,
+        body,
         reject
     };
 }
@@ -276,8 +294,9 @@ function readOAuth(v) {
         return undefined;
     }
     const scopes = v.scopes === undefined || v.scopes === null ? [] : strArr(v.scopes);
-    if (!scopes)
+    if (!scopes) {
         return undefined;
+    }
     const extraAuthParams = readAuthParams(v.extraAuthParams);
     const registrationEndpoint = httpsUrl(v.registrationEndpoint);
     const verify = readVerify(v.verify, tokenUrl);
@@ -287,11 +306,11 @@ function readOAuth(v) {
         tokenUrl,
         scopes,
         tokenAuth: v.tokenAuth,
-        ...(extraAuthParams ? { extraAuthParams } : {}),
-        ...(registrationEndpoint ? { registrationEndpoint } : {}),
-        ...(isPort(v.port) ? { port: v.port } : {}),
-        ...(typeof v.sharedIosSession === 'boolean' ? { sharedIosSession: v.sharedIosSession } : {}),
-        ...(verify ? { verify } : {})
+        extraAuthParams,
+        registrationEndpoint,
+        port: isPort(v.port) ? v.port : undefined,
+        sharedIosSession: typeof v.sharedIosSession === 'boolean' ? v.sharedIosSession : undefined,
+        verify
     };
 }
 export function toWireSetup(setup) {
@@ -318,14 +337,15 @@ function readFields(v) {
         return undefined;
     const fields = [];
     for (const raw of v) {
-        if (!isObj(raw) || typeof raw.key !== 'string' || typeof raw.label !== 'string')
+        if (!isObj(raw) || typeof raw.key !== 'string' || typeof raw.label !== 'string') {
             continue;
+        }
         fields.push({
             key: raw.key,
             label: raw.label,
-            ...(typeof raw.placeholder === 'string' ? { placeholder: raw.placeholder } : {}),
-            ...(typeof raw.secret === 'boolean' ? { secret: raw.secret } : {}),
-            ...(typeof raw.required === 'boolean' ? { required: raw.required } : {})
+            placeholder: typeof raw.placeholder === 'string' ? raw.placeholder : undefined,
+            secret: typeof raw.secret === 'boolean' ? raw.secret : undefined,
+            required: typeof raw.required === 'boolean' ? raw.required : undefined
         });
     }
     return fields.length > 0 ? fields : undefined;

package/dist-lib/lib/tools/skills/mention.js

@@ -3,8 +3,9 @@ import { skillMentionName } from './mention-name.js';
 export { skillMentionName };
 export function resolveSkillMention(text, catalog) {
     const name = skillMentionName(text);
-    if (!name)
+    if (!name) {
         return null;
+    }
     return catalog.find((skill) => skill.name.toLowerCase() === name) ?? null;
 }
 const MIN_IMPLICIT_NAME_LENGTH = 4;
@@ -19,15 +20,15 @@ export function resolveImplicitSkill(text, activeSkills) {
     let best = null;
     let bestLength = 0;
     for (const skill of activeSkills) {
-        const names = skill.preloadOnName === false
-            ? (skill.aliases ?? [])
-            : [skill.name, ...(skill.aliases ?? [])];
+        const names = skill.preloadOnName === false ? (skill.aliases ?? []) : [skill.name, ...(skill.aliases ?? [])];
         for (const word of names) {
             const candidate = word.toLowerCase();
-            if (candidate.length < MIN_IMPLICIT_NAME_LENGTH)
+            if (candidate.length < MIN_IMPLICIT_NAME_LENGTH) {
                 continue;
-            if (!matchesName(text, candidate))
+            }
+            if (!matchesName(text, candidate)) {
                 continue;
+            }
             const weight = candidate.replace(/\+/g, '').length;
             if (weight > bestLength) {
                 best = skill;

package/dist-lib/lib/tools/skills/obsidian-readiness.d.ts

@@ -4,11 +4,11 @@ export declare const OBSIDIAN_BIN_CANDIDATES: Readonly<Record<string, readonly s
 export declare const OBSIDIAN_CONFIG_CANDIDATES: Readonly<Record<string, readonly string[]>>;
 export declare function expandObsidianPath(candidate: string, env?: Record<string, string | undefined>, home?: string): string;
 export declare function firstExistingPath(candidates: readonly string[], expand: (candidate: string) => string, exists: (candidate: string) => boolean): string | null;
-export type ObsidianPathProbe = {
+export interface ObsidianPathProbe {
     expand?: (candidate: string) => string;
     exists?: (candidate: string) => boolean;
     readText?: (candidate: string) => string;
-};
+}
 export declare function obsidianInstallState(platform: string | undefined, probe?: ObsidianPathProbe): 'installed' | 'missing';
 export declare function parseObsidianCliEnabled(text: string): boolean | null;
 export declare function obsidianCliState(platform: string | undefined, probe?: ObsidianPathProbe): 'enabled' | 'disabled' | 'unknown';

package/dist-lib/lib/tools/skills/obsidian-readiness.js

@@ -43,8 +43,9 @@ export function expandObsidianPath(candidate, env = environment(), home = homedi
 export function firstExistingPath(candidates, expand, exists) {
     for (const candidate of candidates) {
         const expanded = expand(candidate);
-        if (expanded && exists(expanded))
+        if (expanded && exists(expanded)) {
             return expanded;
+        }
     }
     return null;
 }
@@ -57,6 +58,9 @@ export function obsidianInstallState(platform, probe = {}) {
 export function parseObsidianCliEnabled(text) {
     try {
         const value = JSON.parse(text);
+        if (typeof value !== 'object' || value === null || !('cli' in value)) {
+            return null;
+        }
         return typeof value.cli === 'boolean' ? value.cli : null;
     }
     catch {
@@ -68,11 +72,15 @@ export function obsidianCliState(platform, probe = {}) {
     const exists = probe.exists ?? ((candidate) => fs.existsSync(candidate));
     const readText = probe.readText ?? ((candidate) => fs.readFileSync(candidate, 'utf8'));
     const config = firstExistingPath(OBSIDIAN_CONFIG_CANDIDATES[platform ?? ''] ?? [], expand, exists);
-    if (!config)
+    if (!config) {
         return 'unknown';
+    }
     try {
         const enabled = parseObsidianCliEnabled(readText(config));
-        return enabled === null ? 'unknown' : enabled ? 'enabled' : 'disabled';
+        if (enabled === null) {
+            return 'unknown';
+        }
+        return enabled ? 'enabled' : 'disabled';
     }
     catch {
         return 'unknown';

package/dist-lib/lib/tools/skills/overlay-crud.d.ts

@@ -10,9 +10,11 @@ export interface SkillFileContent {
 export declare function listManagedSkills(baseDir: string, overlayDir: string | null): Promise<ManagedSkill[]>;
 export declare function readSkillFile(baseDir: string, overlayDir: string | null, name: string): Promise<SkillFileContent | null>;
 export declare function writeSkillFile(overlayDir: string, name: string, content: string): Promise<string>;
-export declare function copyBaseForEdit(baseDir: string, overlayDir: string, name: string): Promise<{
+export interface CopyBaseResult {
     copied: boolean;
-}>;
-export declare function deleteOverlaySkill(overlayDir: string, name: string): Promise<{
+}
+export declare function copyBaseForEdit(baseDir: string, overlayDir: string, name: string): Promise<CopyBaseResult>;
+export interface DeleteOverlayResult {
     removed: boolean;
-}>;
+}
+export declare function deleteOverlaySkill(overlayDir: string, name: string): Promise<DeleteOverlayResult>;

package/dist-lib/lib/tools/skills/overlay-crud.js

@@ -41,8 +41,9 @@ export async function readSkillFile(baseDir, overlayDir, name) {
     assertSafeName(name);
     if (overlayDir) {
         const over = await readIfPresent(path.join(overlayDir, name, 'SKILL.md'));
-        if (over !== null)
+        if (over !== null) {
             return { content: over, origin: 'overlay' };
+        }
     }
     const base = await readIfPresent(path.join(baseDir, name, 'SKILL.md'));
     return base !== null ? { content: base, origin: 'base' } : null;
@@ -60,19 +61,22 @@ export async function writeSkillFile(overlayDir, name, content) {
 export async function copyBaseForEdit(baseDir, overlayDir, name) {
     assertSafeName(name);
     const dest = path.join(overlayDir, name);
-    if (await exists(dest))
+    if (await exists(dest)) {
         return { copied: false };
+    }
     const src = path.join(baseDir, name);
-    if (!(await exists(src)))
+    if (!(await exists(src))) {
         throw new Error(`skill not found: ${name}`);
+    }
     await copyDir(src, dest);
     return { copied: true };
 }
 export async function deleteOverlaySkill(overlayDir, name) {
     assertSafeName(name);
     const dir = path.join(overlayDir, name);
-    if (!(await exists(dir)))
+    if (!(await exists(dir))) {
         return { removed: false };
+    }
     await fs.promises.rm(dir, { recursive: true, force: true });
     return { removed: true };
 }
@@ -90,9 +94,11 @@ async function copyDir(src, dest) {
     for (const entry of await fs.promises.readdir(src, { withFileTypes: true })) {
         const from = path.join(src, entry.name);
         const to = path.join(dest, entry.name);
-        if (entry.isDirectory())
+        if (entry.isDirectory()) {
             await copyDir(from, to);
-        else if (entry.isFile())
+        }
+        else if (entry.isFile()) {
             await fs.promises.writeFile(to, await fs.promises.readFile(from));
+        }
     }
 }

package/dist-lib/lib/tools/skills/overlay-dir.js

@@ -6,8 +6,9 @@ const SDK_CONFIG_PATH_ENV = 'QVAC_CONFIG_PATH';
 const OVERLAY_DIR_NAME = 'skills';
 export function resolveSkillsOverlayDir(env = process.env) {
     const configPath = env[SDK_CONFIG_PATH_ENV];
-    if (!configPath)
+    if (!configPath) {
         return null;
+    }
     return path.join(path.dirname(configPath), OVERLAY_DIR_NAME);
 }
 export function ensureSkillsOverlayDir(env = process.env) {
@@ -16,7 +17,8 @@ export function ensureSkillsOverlayDir(env = process.env) {
 }
 async function materialize(dir) {
     await fs.promises.mkdir(dir, { recursive: true });
-    if (os.platform() !== 'win32')
+    if (os.platform() !== 'win32') {
         await fs.promises.chmod(dir, 0o700);
+    }
     return dir;
 }

package/dist-lib/lib/tools/skills/overlay-watch.d.ts

@@ -7,7 +7,8 @@ export type OverlayChangeStream = AsyncIterable<{
     destroy?: () => void;
 };
 export type WatchStreamFactory = (overlayDir: string) => OverlayChangeStream;
-export declare function watchSkillsOverlay(overlayDir: string, onChange: () => void, opts?: {
+export interface WatchSkillsOverlayOptions {
     debounceMs?: number;
     createStream?: WatchStreamFactory;
-}): OverlayWatcher;
+}
+export declare function watchSkillsOverlay(overlayDir: string, onChange: () => void, opts?: WatchSkillsOverlayOptions): OverlayWatcher;

package/dist-lib/lib/tools/skills/overlay-watch.js

@@ -9,19 +9,22 @@ export function watchSkillsOverlay(overlayDir, onChange, opts = {}) {
     const schedule = () => {
         if (stopped)
             return;
-        if (timer)
+        if (timer) {
             clearTimeout(timer);
+        }
         timer = setTimeout(() => {
             timer = null;
-            if (!stopped)
+            if (!stopped) {
                 onChange();
+            }
         }, debounceMs);
     };
     void (async () => {
         try {
             for await (const batch of stream) {
-                if (batch?.diff && batch.diff.length > 0)
+                if (batch?.diff && batch.diff.length > 0) {
                     schedule();
+                }
             }
         }
         catch {
@@ -32,8 +35,9 @@ export function watchSkillsOverlay(overlayDir, onChange, opts = {}) {
             if (stopped)
                 return;
             stopped = true;
-            if (timer)
+            if (timer) {
                 clearTimeout(timer);
+            }
             timer = null;
             stream.destroy?.();
         }

package/dist-lib/lib/tools/skills/setup-routes.js

@@ -4,9 +4,7 @@ export function deriveSetup(entry, state) {
         return undefined;
     return {
         ...entry.setup,
-        ...(entry.setup.routes
-            ? { routes: entry.setup.routes.map((route) => withSatisfied(route, state)) }
-            : {})
+        routes: entry.setup.routes?.map((route) => withSatisfied(route, state))
     };
 }
 function withSatisfied(route, state) {

package/dist-lib/lib/tools/skills/skill-settings.js

@@ -19,7 +19,10 @@ function envToken(value) {
     return value.toUpperCase().replace(/[^A-Z0-9]/g, '_');
 }
 function settingKeyToken(value) {
-    return value.toUpperCase().replace(/-/g, '_H_').replace(/[^A-Z0-9_]/g, '_');
+    return value
+        .toUpperCase()
+        .replace(/-/g, '_H_')
+        .replace(/[^A-Z0-9_]/g, '_');
 }
 export function settingsEnv(skill, settings) {
     const env = {};

package/dist-lib/lib/tools/skills/skill-state.d.ts

@@ -25,16 +25,11 @@ export interface SkillStateInputs {
     readonly obsidianProbe?: ObsidianPathProbe;
     readonly binOnPath?: (bin: string, platform?: string) => boolean;
 }
-export declare function isStub(entry: {
-    readonly stub?: boolean;
-}): boolean;
-export declare function isToolSupported(entry: {
+export declare function isStub(entry: Pick<SkillStateEntry, 'stub'>): boolean;
+export interface SkillToolsEntry {
     readonly tools: readonly string[];
-}, installedTools: ReadonlySet<string>): boolean;
-export declare function supportsPlatform(entry: {
-    readonly platform: readonly string[];
-}, platform: string | undefined): boolean;
-export declare function isModelCompatible(entry: {
-    readonly minCapabilityProfile?: string;
-}, activeProfile: CapabilityProfile | undefined): boolean;
+}
+export declare function isToolSupported(entry: SkillToolsEntry, installedTools: ReadonlySet<string>): boolean;
+export declare function supportsPlatform(entry: Pick<SkillStateEntry, 'platform'>, platform: string | undefined): boolean;
+export declare function isModelCompatible(entry: Pick<SkillStateEntry, 'minCapabilityProfile'>, activeProfile: CapabilityProfile | undefined): boolean;
 export declare function resolveSkillState(entry: SkillStateEntry, inputs?: SkillStateInputs): Promise<SkillState>;