@singbox-iac/cli 0.1.16 → 0.1.18

package/dist/modules/diagnostics/index.js

@@ -0,0 +1,306 @@
+import { spawn } from "node:child_process";
+import { lookup } from "node:dns/promises";
+import net from "node:net";
+import { collectStatusReport, } from "../status/index.js";
+export async function collectDiagnosticsReport(input) {
+    const statusCollector = input.statusCollector ?? collectStatusReport;
+    const status = await statusCollector({
+        ...(input.config ? { config: input.config } : {}),
+        ...(input.configPath ? { configPath: input.configPath } : {}),
+        ...(input.singBoxBinary ? { singBoxBinary: input.singBoxBinary } : {}),
+        ...(input.launchAgentsDir ? { launchAgentsDir: input.launchAgentsDir } : {}),
+        ...(input.label ? { label: input.label } : {}),
+        ...(input.runtimeLabel ? { runtimeLabel: input.runtimeLabel } : {}),
+    });
+    const commandRunner = input.commandRunner ?? runCommand;
+    const dnsLookup = input.dnsLookup ?? lookupHostnameAddresses;
+    const checks = [
+        createRuntimeProcessCheck(status),
+        ...createListenerChecks(status),
+        ...(status.runtime.systemProxy ? [createSystemProxyCheck(status)] : []),
+        ...createTunChecks(status),
+        createLiveConfigCheck(status),
+        createScheduleCheck(status),
+        createTransactionCheck(status),
+        ...(await createLocalNetworkChecks({
+            ...(input.config ? { config: input.config } : {}),
+            status,
+            commandRunner,
+            dnsLookup,
+        })),
+    ];
+    return {
+        generatedAt: new Date().toISOString(),
+        ...(status.builderConfigPath ? { builderConfigPath: status.builderConfigPath } : {}),
+        summary: summarizeChecks(checks),
+        checks,
+        status,
+    };
+}
+function createRuntimeProcessCheck(status) {
+    return {
+        status: status.runtime.processRunning ? "PASS" : "WARN",
+        name: "runtime-process",
+        details: status.runtime.processRunning
+            ? `running${status.runtime.processIds.length > 0 ? ` (${status.runtime.processIds.join(", ")})` : ""}`
+            : `stopped (label=${status.runtime.runtimeLabel})`,
+    };
+}
+function createListenerChecks(status) {
+    return status.runtime.listeners.map((listener) => ({
+        status: listener.active ? "PASS" : "WARN",
+        name: `listener:${listener.tag}`,
+        details: `${listener.listen}:${listener.port} ${listener.active ? "accepting connections" : "not accepting connections"}`,
+    }));
+}
+function createTunChecks(status) {
+    if (status.runtime.desktopProfile !== "tun") {
+        return [];
+    }
+    return [
+        makeCheck(status.runtime.tunInterfacePresent === false ? "WARN" : "PASS", "tun-interface", status.runtime.tunInterfacePresent === undefined
+            ? "TUN interface state is unavailable."
+            : status.runtime.tunInterfacePresent
+                ? "TUN interface is present."
+                : "TUN interface is missing."),
+        ...(status.runtime.fakeIpCachePath
+            ? [
+                makeCheck(status.runtime.fakeIpCachePresent === false ? "WARN" : "PASS", "fakeip-cache", `${status.runtime.fakeIpCachePath}${status.runtime.fakeIpCachePresent ? " [present]" : " [missing]"}`),
+            ]
+            : []),
+    ];
+}
+function createSystemProxyCheck(status) {
+    const systemProxy = status.runtime.systemProxy;
+    if (!systemProxy) {
+        return makeCheck("WARN", "system-proxy", "Desktop runtime is not in system-proxy mode.");
+    }
+    const actual = formatSystemProxyServices(systemProxy.actual);
+    if (systemProxy.state === "active") {
+        return makeCheck("PASS", "system-proxy", `active at ${formatProxyEndpoint(systemProxy.expected)} (${actual})`);
+    }
+    return makeCheck("WARN", "system-proxy", `state=${systemProxy.state}, expected=${formatProxyEndpoint(systemProxy.expected)}, actual=${actual}${systemProxy.nextAction ? `, hint=${systemProxy.nextAction}` : ""}`);
+}
+function createLiveConfigCheck(status) {
+    return makeCheck(status.config.liveExists ? "PASS" : "WARN", "live-config", status.config.livePath
+        ? `${status.config.livePath}${status.config.liveExists ? " [present]" : " [missing]"}`
+        : "(unset)");
+}
+function createScheduleCheck(status) {
+    if (!status.scheduler.enabled) {
+        return makeCheck("PASS", "schedule", `disabled in builder config (label=${status.scheduler.label})`);
+    }
+    if (!status.scheduler.installed) {
+        return makeCheck("WARN", "schedule", `enabled in builder config but no LaunchAgent exists at ${status.scheduler.plistPath}`);
+    }
+    return makeCheck(status.scheduler.loaded === false ? "WARN" : "PASS", "schedule", `${status.scheduler.label} installed${status.scheduler.loaded !== undefined ? ` loaded=${String(status.scheduler.loaded)}` : ""}`);
+}
+function createTransactionCheck(status) {
+    if (!status.history.lastTransactionId) {
+        return makeCheck("WARN", "latest-transaction", "No publish transaction was recorded.");
+    }
+    const transactionDetails = `${status.history.lastTransactionId} ${status.history.lastTransactionStatus ?? "unknown"}${status.history.lastTransactionAt ? ` at ${status.history.lastTransactionAt}` : ""}`;
+    return makeCheck(status.history.lastTransactionStatus === "applied" ? "PASS" : "WARN", "latest-transaction", transactionDetails);
+}
+async function createLocalNetworkChecks(input) {
+    const checks = [];
+    checks.push(await createDefaultRouteCheck(input.commandRunner));
+    checks.push(await createSystemDnsCheck(input.commandRunner));
+    for (const hostname of selectDiagnosticHostnames(input.config)) {
+        checks.push(await createDnsProbeCheck(hostname, input.status, input.dnsLookup));
+    }
+    return checks;
+}
+async function createDefaultRouteCheck(commandRunner) {
+    try {
+        const result = await runCommandWithFallback(commandRunner, ["/usr/sbin/route", "/sbin/route"], ["-n", "get", "default"]);
+        const gateway = matchCommandValue(result.stdout, "gateway");
+        const networkInterface = matchCommandValue(result.stdout, "interface");
+        if (!gateway || !networkInterface) {
+            return makeCheck("WARN", "default-route", "Default route output was present, but gateway or interface could not be parsed.");
+        }
+        return makeCheck("PASS", "default-route", `interface=${networkInterface}, gateway=${gateway}`);
+    }
+    catch (error) {
+        return makeCheck("WARN", "default-route", error instanceof Error ? error.message : String(error));
+    }
+}
+async function runCommandWithFallback(commandRunner, commands, args) {
+    let lastError;
+    for (const command of commands) {
+        try {
+            return await commandRunner(command, args);
+        }
+        catch (error) {
+            lastError = error;
+            if (!isCommandMissingError(error)) {
+                throw error;
+            }
+        }
+    }
+    throw lastError instanceof Error
+        ? lastError
+        : new Error("No executable command candidates succeeded.");
+}
+async function createSystemDnsCheck(commandRunner) {
+    try {
+        const result = await commandRunner("/usr/sbin/scutil", ["--dns"]);
+        const nameservers = parseSystemDnsNameservers(result.stdout);
+        if (nameservers.length === 0) {
+            return makeCheck("WARN", "system-dns", "No nameservers were parsed from `scutil --dns`.");
+        }
+        return makeCheck("PASS", "system-dns", `nameservers=${nameservers.slice(0, 4).join(", ")}`);
+    }
+    catch (error) {
+        return makeCheck("WARN", "system-dns", error instanceof Error ? error.message : String(error));
+    }
+}
+async function createDnsProbeCheck(hostname, status, dnsLookup) {
+    try {
+        const addresses = [...new Set(await dnsLookup(hostname))];
+        if (addresses.length === 0) {
+            return makeCheck("WARN", `dns-probe:${hostname}`, "Lookup returned no addresses.");
+        }
+        const onlySuspiciousAddresses = addresses.every(isSuspiciousPublicAddress);
+        if (onlySuspiciousAddresses) {
+            return makeCheck("WARN", `dns-probe:${hostname}`, `Resolved only suspicious addresses: ${addresses.join(", ")}`);
+        }
+        return makeCheck("PASS", `dns-probe:${hostname}`, `resolved ${addresses.slice(0, 3).join(", ")}${addresses.length > 3 ? ` (+${addresses.length - 3} more)` : ""}`);
+    }
+    catch (error) {
+        const suffix = status.runtime.systemProxy?.state === "active"
+            ? " while runtime proxy state is healthy."
+            : ".";
+        return makeCheck("WARN", `dns-probe:${hostname}`, `${error instanceof Error ? error.message : String(error)}${suffix}`);
+    }
+}
+async function lookupHostnameAddresses(hostname) {
+    const records = await lookup(hostname, { all: true, verbatim: true });
+    return records.map((record) => record.address);
+}
+function selectDiagnosticHostnames(config) {
+    if (!config) {
+        return [];
+    }
+    const hostnames = config.verification.scenarios
+        .map((scenario) => {
+        try {
+            return new URL(scenario.url).hostname;
+        }
+        catch {
+            return undefined;
+        }
+    })
+        .filter((value) => Boolean(value));
+    return [...new Set(hostnames)].slice(0, 3);
+}
+function summarizeChecks(checks) {
+    const summary = {
+        pass: 0,
+        warn: 0,
+        fail: 0,
+    };
+    for (const check of checks) {
+        if (check.status === "PASS") {
+            summary.pass += 1;
+            continue;
+        }
+        if (check.status === "WARN") {
+            summary.warn += 1;
+            continue;
+        }
+        summary.fail += 1;
+    }
+    return summary;
+}
+function makeCheck(status, name, details) {
+    return { status, name, details };
+}
+function formatProxyEndpoint(endpoint) {
+    return `${endpoint.host}:${endpoint.port}`;
+}
+function formatSystemProxyServices(services) {
+    if (services.length === 0) {
+        return "unknown";
+    }
+    const enabledServices = services.filter((service) => service.enabled);
+    if (enabledServices.length === 0) {
+        return "inactive";
+    }
+    return enabledServices
+        .map((service) => service.host && typeof service.port === "number"
+        ? `${service.kind}=${service.host}:${service.port}`
+        : `${service.kind}=(incomplete)`)
+        .join(", ");
+}
+function parseSystemDnsNameservers(stdout) {
+    const nameservers = stdout
+        .split("\n")
+        .map((line) => line.match(/nameserver\[[0-9]+\]\s*:\s*(.+?)\s*$/)?.[1]?.trim())
+        .filter((value) => Boolean(value));
+    return [...new Set(nameservers)];
+}
+function matchCommandValue(stdout, key) {
+    return stdout
+        .split("\n")
+        .map((line) => line.match(new RegExp(`^\\s*${key}:\\s*(.+?)\\s*$`))?.[1]?.trim())
+        .find((value) => Boolean(value));
+}
+function isCommandMissingError(error) {
+    if (error instanceof Error) {
+        const commandError = error;
+        return commandError.code === "ENOENT" || error.message.includes("ENOENT");
+    }
+    return false;
+}
+function isSuspiciousPublicAddress(address) {
+    const ipVersion = net.isIP(address);
+    if (ipVersion === 4) {
+        const octets = address.split(".").map((part) => Number.parseInt(part, 10));
+        if (octets.length !== 4 || octets.some((part) => Number.isNaN(part))) {
+            return true;
+        }
+        const a = octets[0] ?? -1;
+        const b = octets[1] ?? -1;
+        return (a === 0 ||
+            a === 10 ||
+            a === 127 ||
+            (a === 169 && b === 254) ||
+            (a === 172 && b >= 16 && b <= 31) ||
+            (a === 192 && b === 168));
+    }
+    if (ipVersion === 6) {
+        const normalized = address.toLowerCase();
+        return (normalized === "::1" ||
+            normalized === "::" ||
+            normalized.startsWith("fc") ||
+            normalized.startsWith("fd") ||
+            normalized.startsWith("fe80:"));
+    }
+    return true;
+}
+async function runCommand(command, args) {
+    return new Promise((resolve, reject) => {
+        const child = spawn(command, args, {
+            stdio: ["ignore", "pipe", "pipe"],
+        });
+        let stdout = "";
+        let stderr = "";
+        child.stdout.on("data", (chunk) => {
+            stdout += chunk.toString();
+        });
+        child.stderr.on("data", (chunk) => {
+            stderr += chunk.toString();
+        });
+        child.on("error", reject);
+        child.on("close", (code) => {
+            if (code === 0) {
+                resolve({ stdout, stderr });
+                return;
+            }
+            const details = [stdout.trim(), stderr.trim()].filter((value) => value.length > 0).join("\n");
+            reject(new Error(details || `Command failed: ${command} ${args.join(" ")}`));
+        });
+    });
+}
+//# sourceMappingURL=index.js.map

package/dist/modules/diagnostics/index.js.map

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

package/dist/modules/dns-plan/index.js

@@ -1,7 +1,12 @@
+import path from "node:path";
 const defaultLocalServerTag = "dns-local-default";
 const defaultProxyServerTag = "dns-remote-primary";
 const defaultDirectServerTag = "dns-remote-cn";
+const defaultFakeIpServerTag = "dns-fakeip";
 export function buildDnsPlan(input) {
+    const tunConfig = input.config.runtime.desktop.tun;
+    const fakeIpMode = input.config.runtime.desktop.profile === "tun" &&
+        (tunConfig.dnsMode ?? "fake-ip") === "fake-ip";
     const servers = [
         {
             type: "local",
@@ -20,19 +25,29 @@ export function buildDnsPlan(input) {
             serverPort: 53,
         },
     ];
+    if (fakeIpMode) {
+        servers.push({
+            type: "fakeip",
+            tag: defaultFakeIpServerTag,
+            inet4Range: tunConfig.fakeIp?.inet4Range ?? "198.18.0.0/15",
+            inet6Range: tunConfig.fakeIp?.inet6Range ?? "fc00::/18",
+        });
+    }
     const nameserverPolicy = [];
     const activeRuleSetTags = new Set(input.activeRuleSetTags);
-    if (activeRuleSetTags.has("geosite-cn") || activeRuleSetTags.has("geoip-cn")) {
+    for (const override of input.intent.localOverrides.dnsPolicy ?? []) {
         nameserverPolicy.push({
             match: {
-                ruleSet: [...["geosite-cn", "geoip-cn"].filter((tag) => activeRuleSetTags.has(tag))],
+                domainSuffix: override.domainSuffix,
             },
-            resolvers: [defaultDirectServerTag],
+            resolvers: override.server,
         });
     }
     for (const policy of input.intent.sitePolicies) {
         const hasDnsRelevantMatch = policy.match.domain || policy.match.domainSuffix || policy.match.ruleSet;
-        if (!hasDnsRelevantMatch) {
+        if (!hasDnsRelevantMatch ||
+            policy.action.type !== "route" ||
+            policy.action.outboundGroup !== "direct") {
             continue;
         }
         nameserverPolicy.push({
@@ -45,24 +60,52 @@ export function buildDnsPlan(input) {
                     }
                     : {}),
             },
-            resolvers: policy.action.type === "route" && policy.action.outboundGroup === "direct"
-                ? [defaultDirectServerTag]
-                : [defaultProxyServerTag],
+            resolvers: [defaultDirectServerTag],
         });
     }
-    for (const override of input.intent.localOverrides.dnsPolicy ?? []) {
+    if (activeRuleSetTags.has("geosite-cn") || activeRuleSetTags.has("geoip-cn")) {
         nameserverPolicy.push({
             match: {
-                domainSuffix: override.domainSuffix,
+                ruleSet: [...["geosite-cn", "geoip-cn"].filter((tag) => activeRuleSetTags.has(tag))],
             },
-            resolvers: override.server,
+            resolvers: [defaultDirectServerTag],
         });
     }
+    if (fakeIpMode) {
+        nameserverPolicy.push({
+            match: {
+                queryType: ["A", "AAAA"],
+            },
+            resolvers: [defaultFakeIpServerTag],
+        });
+    }
+    else {
+        for (const policy of input.intent.sitePolicies) {
+            const hasDnsRelevantMatch = policy.match.domain || policy.match.domainSuffix || policy.match.ruleSet;
+            if (!hasDnsRelevantMatch) {
+                continue;
+            }
+            nameserverPolicy.push({
+                match: {
+                    ...(policy.match.domain ? { domain: policy.match.domain } : {}),
+                    ...(policy.match.domainSuffix ? { domainSuffix: policy.match.domainSuffix } : {}),
+                    ...(policy.match.ruleSet
+                        ? {
+                            ruleSet: policy.match.ruleSet.filter((tag) => activeRuleSetTags.has(tag)),
+                        }
+                        : {}),
+                },
+                resolvers: policy.action.type === "route" && policy.action.outboundGroup === "direct"
+                    ? [defaultDirectServerTag]
+                    : [defaultProxyServerTag],
+            });
+        }
+    }
     return {
-        mode: "real-ip",
+        mode: fakeIpMode ? "fake-ip" : "real-ip",
         defaultResolvers: [defaultLocalServerTag],
         directResolvers: [defaultDirectServerTag],
-        proxyResolvers: [defaultProxyServerTag],
+        proxyResolvers: [fakeIpMode ? defaultFakeIpServerTag : defaultProxyServerTag],
         fallbackResolvers: [defaultProxyServerTag],
         servers,
         nameserverPolicy,
@@ -73,6 +116,17 @@ export function buildDnsPlan(input) {
             }
             : {}),
         strategy: input.intent.globals.preferIPv6 ? "prefer_ipv6" : "prefer_ipv4",
+        reverseMapping: false,
+        ...(fakeIpMode
+            ? {
+                cacheFile: {
+                    enabled: tunConfig.cache?.enabled ?? true,
+                    path: tunConfig.cache?.path ??
+                        path.join(process.env.HOME ?? "~", ".config", "singbox-iac", "runtime", "tun-cache.db"),
+                    storeFakeIp: tunConfig.cache?.storeFakeIp ?? true,
+                },
+            }
+            : {}),
     };
 }
 export function compileDnsPlan(plan) {
@@ -82,6 +136,8 @@ export function compileDnsPlan(plan) {
             tag: server.tag,
             ...(server.server ? { server: server.server } : {}),
             ...(server.serverPort ? { server_port: server.serverPort } : {}),
+            ...(server.inet4Range ? { inet4_range: server.inet4Range } : {}),
+            ...(server.inet6Range ? { inet6_range: server.inet6Range } : {}),
         })),
         rules: plan.nameserverPolicy.map((rule) => ({
             ...(rule.match.domain ? { domain: [...rule.match.domain] } : {}),
@@ -89,11 +145,16 @@ export function compileDnsPlan(plan) {
             ...(rule.match.ruleSet && rule.match.ruleSet.length > 0
                 ? { rule_set: [...rule.match.ruleSet] }
                 : {}),
+            ...(rule.match.queryType && rule.match.queryType.length > 0
+                ? { query_type: [...rule.match.queryType] }
+                : {}),
             server: rule.resolvers[0],
         })),
         final: plan.defaultResolvers[0],
         strategy: plan.strategy,
         ...(plan.localHosts ? { hosts: plan.localHosts } : {}),
+        reverse_mapping: plan.reverseMapping,
+        ...(plan.independentCache !== undefined ? { independent_cache: plan.independentCache } : {}),
     };
 }
 export function getDefaultDnsServerTag() {

package/dist/modules/dns-plan/index.js.map

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

package/dist/modules/intent/index.js

@@ -24,10 +24,10 @@ export function intentFromNaturalLanguagePlan(plan) {
             match: {
                 processName: ["Antigravity", "Antigravity.app", "Cursor", "cursor", "claude", "gemini"],
             },
-            inbound: "in-proxifier",
+            capture: "process-aware",
             outboundGroup: plan.groupDefaults.processProxy.defaultTarget,
             verify: {
-                expectProxyHit: true,
+                expectCaptureHit: true,
             },
         });
     }

package/dist/modules/intent/index.js.map

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

package/dist/modules/layered-authoring/index.d.ts

@@ -0,0 +1,45 @@
+import type { BuilderConfig } from "../../config/schema.js";
+import type { IntentIR } from "../../domain/intent.js";
+import type { NaturalLanguagePlan } from "../natural-language/index.js";
+import { type LoadedUserRules } from "../user-rules/index.js";
+export type AuthoringWriteMode = "patch" | "replace";
+export interface LayeredAuthoringLayer {
+    readonly prompt?: string;
+    readonly appliedAt?: string;
+    readonly plan: NaturalLanguagePlan;
+}
+export interface LayeredAuthoringState {
+    readonly version: 1;
+    readonly base: LayeredAuthoringLayer;
+    readonly patches: readonly LayeredAuthoringLayer[];
+}
+export interface ResolvedLayeredAuthoringState {
+    readonly filePath: string;
+    readonly exists: boolean;
+    readonly state: LayeredAuthoringState;
+    readonly mergedPlan: NaturalLanguagePlan;
+    readonly mergedIntent: IntentIR;
+}
+export declare function resolveLayeredAuthoringState(input: {
+    readonly config: BuilderConfig;
+    readonly rulesPath?: string;
+    readonly loadedUserRules?: LoadedUserRules;
+}): Promise<ResolvedLayeredAuthoringState>;
+export declare function resolveLayeredAuthoringPath(rulesPath: string): string;
+export declare function applyLayeredAuthoringUpdate(input: {
+    readonly current: LayeredAuthoringState;
+    readonly prompt: string;
+    readonly plan: NaturalLanguagePlan;
+    readonly mode: AuthoringWriteMode;
+    readonly appliedAt?: string;
+}): LayeredAuthoringState;
+export declare function writeLayeredAuthoringState(input: {
+    readonly rulesPath: string;
+    readonly state: LayeredAuthoringState;
+}): Promise<string>;
+export declare function mergeNaturalLanguagePlans(plans: readonly NaturalLanguagePlan[]): NaturalLanguagePlan;
+export declare function materializeLayeredAuthoringState(input: {
+    readonly filePath: string;
+    readonly exists: boolean;
+    readonly state: LayeredAuthoringState;
+}): ResolvedLayeredAuthoringState;