newmark-agent 0.4.5 → 0.4.6

package/dist/cli-commands.d.ts

@@ -1,4 +1,4 @@
-export declare const CLI_COMMANDS: readonly ["state", "tool", "send", "validate-models", "fuzzy-inject", "skills-market", "memory-lab", "install-update", "compat", "compat-tool"];
+export declare const CLI_COMMANDS: readonly ["state", "tool", "send", "validate-models", "fuzzy-inject", "skills-market", "memory-lab", "install-update", "compat", "compat-tool", "pair", "remote"];
 export declare function cliHelpRequested(args: string[]): boolean;
 /**
  * Compatibility discovery reads third-party metadata outside the selected

package/dist/cli-commands.js

@@ -49,7 +49,8 @@ const compat_1 = require("./core/compat");
 const dshCompatibility_1 = require("./core/dshCompatibility");
 const memoryLab_1 = require("./core/memoryLab");
 const installUpdate_1 = require("./core/installUpdate");
-exports.CLI_COMMANDS = ['state', 'tool', 'send', 'validate-models', 'fuzzy-inject', 'skills-market', 'memory-lab', 'install-update', 'compat', 'compat-tool'];
+const mobilePairing_1 = require("./core/mobilePairing");
+exports.CLI_COMMANDS = ['state', 'tool', 'send', 'validate-models', 'fuzzy-inject', 'skills-market', 'memory-lab', 'install-update', 'compat', 'compat-tool', 'pair', 'remote'];
 const CLI_COMMAND_HELP = {
     state: [
         'Usage: Newmark.exe state [--root <dir>]',
@@ -80,9 +81,17 @@ const CLI_COMMAND_HELP = {
         'Usage: Newmark.exe memory-lab [--read|--component <name>|--update ...|--reindex] [--root <dir>]',
         'Read or update the local Memory Lab index and components.',
     ],
+    pair: [
+        'Usage: Newmark.exe pair [--root <dir>]',
+        'Print a Tailscale pairing QR code and URL for the Newmark mobile app.',
+    ],
+    remote: [
+        'Usage: Newmark.exe remote --on|--off [--root <dir>]',
+        'Enable or disable mobile remote-touch over Tailscale.',
+    ],
     'install-update': [
-        'Usage: Newmark.exe install-update (--source <path>|--check-github|--from-github) [options] [--root <dir>]',
-        'Inspect or apply a local/GitHub update using the selected install target.',
+        'Usage: Newmark.exe install-update (--source <path>|--check-github|--from-github|--msi <path>) [options] [--root <dir>]',
+        'Inspect or apply a local/GitHub update, or run a managed MSI install with process confirmation, previous-version uninstall, and legacy cleanup.',
     ],
     compat: [
         'Usage: Newmark.exe compat [--target all|tools|plugins|dsh|marketplaces|skills|agents|subagents] [--root <dir>]',
@@ -104,12 +113,12 @@ const CLI_VALUE_FLAGS = new Set([
     '--candidate-models', '--protocol', '--query', '--type', '--path', '--component', '--source-id',
     '--remove-source', '--enable-source', '--disable-source', '--source', '--target', '--target-file',
     '--expected-version', '--preserve', '--repo', '--tag', '--asset', '--version', '--content-file',
-    '--content', '--description', '--tags',
+    '--content', '--description', '--tags', '--msi', '--log-dir',
 ]);
 const CLI_BOOLEAN_FLAGS = new Set([
     '--persist', '--agent-only', '--list', '--preview-only', '--sources', '--add-source', '--check-github',
     '--from-github', '--dry-run', '--read', '--index', '--reindex', '--update', '--version', '--folder', '--help', '-h',
-    '--branch-communication',
+    '--branch-communication', '--yes', '--confirm-stop', '--confirm-remove-legacy', '--no-uninstall-previous', '--no-elevate',
 ]);
 function invalidCliCommandArgument(args) {
     let skipNext = false;
@@ -712,6 +721,41 @@ async function runCliCommand(root, args) {
         }
         agent.setMode(requestedMode);
     }
+    if (command === 'pair') {
+        const qr = await (0, mobilePairing_1.pairingQrAscii)(root);
+        safeStdout(qr.ascii + '\n');
+        safeStdout(`\nPairing URL: ${qr.session.url}\n`);
+        safeStdout(`Token file: ${(0, mobilePairing_1.pairingTokenPath)(root)}\n`);
+        const expiresIn = Math.max(0, Math.round((qr.session.expiresAt - Date.now()) / 1000));
+        safeStdout(`Window: ${expiresIn}s — scan with the Newmark mobile app. Waiting for confirmation...\n`);
+        const deadline = qr.session.expiresAt + 1000;
+        while (Date.now() < deadline) {
+            await new Promise(resolve => setTimeout(resolve, 1000));
+            const status = (0, mobilePairing_1.pairingStatus)(root);
+            if (status.confirmed) {
+                safeStdout('\n✓ Paired successfully. QR window closed.\n');
+                return true;
+            }
+            if (status.expired || !status.active) {
+                safeStdout("\n✗ Pairing window expired. Run 'pair' again for a new QR.\n");
+                return false;
+            }
+        }
+        return false;
+    }
+    if (command === 'remote') {
+        const on = args.includes('--on');
+        const off = args.includes('--off');
+        if (on === off) {
+            safeStderr('Usage: Newmark.exe remote --on|--off\n');
+            process.exitCode = 2;
+            return true;
+        }
+        agent.config.set('remote', 'touch_enabled', on);
+        agent.config.save();
+        safeStdout(`Remote touch ${on ? 'enabled' : 'disabled'}\n`);
+        return true;
+    }
     if (command === 'state') {
         printJson(safeState(agent, root));
         return true;
@@ -963,10 +1007,47 @@ async function runCliCommand(root, args) {
                 process.exitCode = 1;
             return true;
         }
+        if (args.includes('--msi')) {
+            const msiPath = argValue(args, '--msi') || positionalAfter(args, 'install-update')[0] || '';
+            const confirmAll = args.includes('--yes');
+            const stopConfirmed = confirmAll || args.includes('--confirm-stop');
+            const removeLegacyConfirmed = confirmAll || args.includes('--confirm-remove-legacy');
+            const options = {
+                stopConfirmed,
+                removeLegacyConfirmed,
+                uninstallPrevious: !args.includes('--no-uninstall-previous'),
+                allowElevate: !args.includes('--no-elevate'),
+                logDir: argValue(args, '--log-dir') || root,
+            };
+            const plan = (0, installUpdate_1.planManagedMsiInstall)(msiPath, options);
+            if (!plan.ok) {
+                printJson(plan);
+                safeStderr(`Managed MSI install cannot start: ${plan.error || 'unknown error'}\n`);
+                process.exitCode = 1;
+                return true;
+            }
+            if (plan.needsStopConfirmation) {
+                printJson(plan);
+                safeStderr('Running Newmark processes were found. Re-run with --confirm-stop (or --yes) to stop them before installing.\n');
+                process.exitCode = 2;
+                return true;
+            }
+            if (plan.needsLegacyRemovalConfirmation) {
+                printJson(plan);
+                safeStderr('Legacy Newmark executables were found outside the install target. Re-run with --confirm-remove-legacy (or --yes) to remove them.\n');
+                process.exitCode = 2;
+                return true;
+            }
+            const result = (0, installUpdate_1.executeManagedMsiInstall)(msiPath, options);
+            printJson(result);
+            if (!result.ok)
+                process.exitCode = 1;
+            return true;
+        }
         const source = pathArgValue(args, '--source') || positionalAfter(args, 'install-update')[0] || '';
         const target = pathArgValue(args, '--target') || root;
         if (!source) {
-            safeStderr('Usage: Newmark.exe install-update (--source <portable-exe-or-unpacked-dir>|--check-github|--from-github) [--repo owner/name] [--tag vX.Y.Z] [--asset name] [--target <dir>] [--target-file <path>] [--expected-version <version>] [--preserve csv] [--dry-run] [--root <dir>]\n');
+            safeStderr('Usage: Newmark.exe install-update (--source <portable-exe-or-unpacked-dir>|--check-github|--from-github|--msi <path>) [--repo owner/name] [--tag vX.Y.Z] [--asset name] [--target <dir>] [--target-file <path>] [--expected-version <version>] [--preserve csv] [--dry-run] [--root <dir>]\n');
             process.exitCode = 1;
             return true;
         }
@@ -1082,7 +1163,8 @@ function cliCommandUsage() {
         '  Newmark.exe fuzzy-inject [--name <provider>] [--env-file <PowerShell-or-dotenv-file>|--env-file-env <ENV_WITH_FILE_PATH>] [--endpoint-env <ENV_WITH_BASE_URL>] [--key-env <ENV_WITH_API_KEY>] [--protocol openai|anthropic] [--preview-only] [--root <dir>]',
         '  Newmark.exe skills-market [--query <text>|--sources|--add-source --name <name> (--url <url>|--path <path>) [--type json|skill-url|local-dir]|--remove-source <id>|--enable-source <id>|--disable-source <id>] [--root <dir>]',
         '  Newmark.exe memory-lab [--read|--component <name>|--update --name <name> --description <text> --tags <csv> --content-file <path> [--folder]|--reindex] [--root <dir>]',
-        '  Newmark.exe install-update (--source <portable-exe-or-unpacked-dir>|--check-github|--from-github) [--repo owner/name] [--tag vX.Y.Z] [--asset name] [--target <dir>] [--target-file <path>] [--expected-version <version>] [--preserve csv] [--dry-run] [--root <dir>]',
+        '  Newmark.exe pair [--root <dir>]',
+        '  Newmark.exe install-update (--source <portable-exe-or-unpacked-dir>|--check-github|--from-github|--msi <path>) [--repo owner/name] [--tag vX.Y.Z] [--asset name] [--target <dir>] [--target-file <path>] [--expected-version <version>] [--preserve csv] [--dry-run] [--confirm-stop|--confirm-remove-legacy|--yes] [--no-uninstall-previous] [--no-elevate] [--log-dir <dir>] [--root <dir>]',
         '  Newmark.exe compat [--target all|tools|plugins|marketplaces|skills|agents|subagents] [--root <dir>]',
         '  Newmark.exe compat-tool --list | --name <opencode-tool> [json-args | --args-file path] [--root <dir>]',
         `Working directory fallback: ${path.resolve('.')}`,

package/dist/cli-discovery.js

@@ -64,6 +64,8 @@ const VALUE_FLAGS = new Set([
     '--inspect-port',
     '--js-flags',
     '--viewer-request',
+    '--msi',
+    '--log-dir',
 ]);
 const BOOLEAN_FLAGS = new Set([
     '--tui',
@@ -76,6 +78,7 @@ const BOOLEAN_FLAGS = new Set([
     '-v',
     '-version',
     '--automation-wake',
+    '--no-browser',
     '--newmark-viewer',
     '--allow-multiple-instances',
     '--disable-gpu',
@@ -101,6 +104,11 @@ const BOOLEAN_FLAGS = new Set([
     '--limit',
     '--scopes',
     '--web',
+    '--yes',
+    '--confirm-stop',
+    '--confirm-remove-legacy',
+    '--no-uninstall-previous',
+    '--no-elevate',
 ]);
 /** Public version spellings accepted by every Newmark entrypoint. */
 function isVersionArgument(args) {

package/dist/conversation-utility-host.bundle.cjs

@@ -328314,6 +328314,9 @@ function defaultConfig() {
       default_input: { _description: "Default input mode", _type: "choice", _values: ["guide", "next"], value: "guide" },
       auto_archive_on_close: { _description: "Auto archive on close", _type: "boolean", value: true }
     },
+    remote: {
+      touch_enabled: { _description: "Allow mobile devices to reach this Newmark instance over Tailscale", _type: "boolean", value: true }
+    },
     models: {
       providers: { _description: "LLM providers", _type: "array", value: [] },
       default_model: { _description: "Default model", _type: "string", value: "" },

package/dist/core/config.js

@@ -849,6 +849,9 @@ function defaultConfig() {
             default_input: { _description: "Default input mode", _type: "choice", _values: ["guide", "next"], value: "guide" },
             auto_archive_on_close: { _description: "Auto archive on close", _type: "boolean", value: true },
         },
+        remote: {
+            touch_enabled: { _description: "Allow mobile devices to reach this Newmark instance over Tailscale", _type: "boolean", value: true },
+        },
         models: {
             providers: { _description: "LLM providers", _type: "array", value: [] },
             default_model: { _description: "Default model", _type: "string", value: "" },

package/dist/core/dshCompatibility.d.ts

@@ -38,6 +38,9 @@ export interface DshBundleSnapshot {
     patchExists: boolean;
     unknownKeys: string[];
     resolved: boolean;
+    installed?: boolean;
+    installPath?: string;
+    enabled?: boolean;
 }
 export interface DshProfileSnapshot {
     name: string;
@@ -188,11 +191,25 @@ export declare function discoverDshCompatibility(root: string, options?: DshComp
  * 既不 import 也不 execute 任何 DSH 插件代码。
  */
 export declare function dshCompactionRuntimeSemantics(): DshCompactionRuntimeSemantics;
-/**
- * DSH 工具层的运行时语义映射（纯只读元数据）。
- * 描述 DSH 工具层各 seam 如何映射到 Newmark 原生工具执行层，并声明破坏性
- * developer-preview schema 更新的 fail-soft 兼容策略。既不 import 也不 execute
- * 任何 DSH 插件代码。
- */
+export declare function dshInstalledBundles(root: string): Array<{
+    name: string;
+    installPath: string;
+    enabled: boolean;
+}>;
+export declare function installDshBundle(root: string, manifestPath: string): {
+    ok: boolean;
+    error?: string;
+    installPath?: string;
+    name?: string;
+};
+export declare function uninstallDshBundle(root: string, name: string): {
+    ok: boolean;
+    error?: string;
+};
+export declare function setDshBundleEnabled(root: string, name: string, enabled: boolean): {
+    ok: boolean;
+    error?: string;
+    enabled?: boolean;
+};
 export declare function dshToolLayerRuntimeSemantics(): DshToolLayerRuntimeSemantics;
 //# sourceMappingURL=dshCompatibility.d.ts.map

package/dist/core/dshCompatibility.js

@@ -35,6 +35,10 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.discoverDshCompatibility = discoverDshCompatibility;
 exports.dshCompactionRuntimeSemantics = dshCompactionRuntimeSemantics;
+exports.dshInstalledBundles = dshInstalledBundles;
+exports.installDshBundle = installDshBundle;
+exports.uninstallDshBundle = uninstallDshBundle;
+exports.setDshBundleEnabled = setDshBundleEnabled;
 exports.dshToolLayerRuntimeSemantics = dshToolLayerRuntimeSemantics;
 const fs = __importStar(require("fs"));
 const os = __importStar(require("os"));
@@ -467,6 +471,13 @@ function discoverDshCompatibility(root, options = {}) {
     if (!profiles.length)
         warnings.push(`No DSH profiles were found under ${profileRoot}.`);
     const dedupedBundles = bundles.filter((bundle, index) => bundles.findIndex(other => path.resolve(other.manifestPath) === path.resolve(bundle.manifestPath)) === index);
+    const installed = dshInstalledBundles(root);
+    const bundlesWithInstall = dedupedBundles.map(bundle => {
+        const found = installed.find(item => item.name === sanitizePluginName(bundle.name));
+        return found
+            ? { ...bundle, installed: true, installPath: found.installPath, enabled: found.enabled }
+            : { ...bundle, installed: false, enabled: false };
+    });
     const dedupedMcp = mcpCandidates.filter((candidate, index) => mcpCandidates.findIndex(other => other.name === candidate.name && other.source === candidate.source) === index);
     const configFiles = unique(profiles.flatMap(profile => profile.configFiles).concat(dedupedBundles.flatMap(bundle => bundle.patchPath && bundle.patchExists ? [bundle.patchPath] : []), homeConfigFiles));
     return {
@@ -492,7 +503,7 @@ function discoverDshCompatibility(root, options = {}) {
         },
         recognizedManifestKeys: ['dsh.bundle.patch', 'dsh.profile.bundles'],
         profiles,
-        bundles: dedupedBundles,
+        bundles: bundlesWithInstall,
         mcpCandidates: dedupedMcp,
         configFiles,
         homeConfigFiles,
@@ -559,6 +570,93 @@ function dshCompactionRuntimeSemantics() {
  * developer-preview schema 更新的 fail-soft 兼容策略。既不 import 也不 execute
  * 任何 DSH 插件代码。
  */
+const DSH_INSTALL_DIR = 'plugins/dsh';
+function sanitizePluginName(name) {
+    return String(name || '')
+        .replace(/^@/, '')
+        .replace(/[/\\:*?"<>|]/g, '_')
+        .trim() || 'dsh-plugin';
+}
+function dshInstallRoot(root) {
+    return path.join(path.resolve(root), DSH_INSTALL_DIR);
+}
+function installedStatePath(installRoot, name) {
+    return path.join(installRoot, name, '.newmark-dsh-installed.json');
+}
+function readInstalledState(filePath) {
+    try {
+        const value = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+        return value && typeof value === 'object' ? { enabled: value.enabled !== false } : { enabled: true };
+    }
+    catch {
+        return null;
+    }
+}
+function dshInstalledBundles(root) {
+    const installRoot = dshInstallRoot(root);
+    const output = [];
+    let entries = [];
+    try {
+        entries = fs.readdirSync(installRoot, { withFileTypes: true });
+    }
+    catch {
+        return output;
+    }
+    for (const entry of entries) {
+        if (!entry.isDirectory() || entry.name.startsWith('.'))
+            continue;
+        const state = readInstalledState(installedStatePath(installRoot, entry.name));
+        output.push({ name: entry.name, installPath: path.join(installRoot, entry.name), enabled: state ? state.enabled : true });
+    }
+    return output.sort((a, b) => a.name.localeCompare(b.name));
+}
+function installDshBundle(root, manifestPath) {
+    const resolved = path.resolve(manifestPath);
+    if (!fileExists(resolved))
+        return { ok: false, error: `DSH bundle manifest not found: ${resolved}` };
+    const manifest = readJson(resolved);
+    const rawName = typeof manifest?.name === 'string' ? manifest.name : path.basename(path.dirname(resolved));
+    const name = sanitizePluginName(rawName);
+    const sourceDir = path.dirname(resolved);
+    const installRoot = dshInstallRoot(root);
+    const targetDir = path.join(installRoot, name);
+    try {
+        fs.rmSync(targetDir, { recursive: true, force: true });
+        fs.mkdirSync(installRoot, { recursive: true });
+        fs.cpSync(sourceDir, targetDir, { recursive: true, force: true });
+        fs.writeFileSync(installedStatePath(installRoot, name), JSON.stringify({ enabled: true, installedAt: new Date().toISOString(), source: sourceDir }, null, 2), 'utf-8');
+        return { ok: true, installPath: targetDir, name };
+    }
+    catch (e) {
+        return { ok: false, error: e instanceof Error ? e.message : String(e) };
+    }
+}
+function uninstallDshBundle(root, name) {
+    const clean = sanitizePluginName(name);
+    const targetDir = path.join(dshInstallRoot(root), clean);
+    try {
+        fs.rmSync(targetDir, { recursive: true, force: true });
+        return { ok: true };
+    }
+    catch (e) {
+        return { ok: false, error: e instanceof Error ? e.message : String(e) };
+    }
+}
+function setDshBundleEnabled(root, name, enabled) {
+    const clean = sanitizePluginName(name);
+    const targetDir = path.join(dshInstallRoot(root), clean);
+    const statePath = installedStatePath(dshInstallRoot(root), clean);
+    if (!fs.existsSync(targetDir))
+        return { ok: false, error: 'DSH plugin is not installed.' };
+    try {
+        fs.mkdirSync(targetDir, { recursive: true });
+        fs.writeFileSync(statePath, JSON.stringify({ enabled: !!enabled, updatedAt: new Date().toISOString() }, null, 2), 'utf-8');
+        return { ok: true, enabled: !!enabled };
+    }
+    catch (e) {
+        return { ok: false, error: e instanceof Error ? e.message : String(e) };
+    }
+}
 function dshToolLayerRuntimeSemantics() {
     return {
         plugin: '@deepseek-ai/dsh-tools',

package/dist/core/installUpdate.d.ts

@@ -64,4 +64,71 @@ export declare function normalizeReleaseVersion(input: string): string;
 export declare function compareSemver(a: string, b: string): number;
 export declare function checkGitHubUpdate(repoInput?: string, tagInput?: string, assetName?: string, token?: string, runtime?: GitHubUpdateCheckRuntimeOptions): Promise<GitHubUpdateCheckResult>;
 export declare function applyGitHubUpdate(options: GitHubUpdateApplyOptions): Promise<GitHubUpdateApplyResult>;
+export interface RunningNewmarkProcess {
+    pid: number;
+    name: string;
+    executablePath: string;
+}
+export interface InstalledNewmarkProduct {
+    productCode: string;
+    displayName: string;
+    installLocation: string;
+    uninstallString: string;
+}
+export interface ManagedMsiInstallOptions {
+    stopConfirmed?: boolean;
+    removeLegacyConfirmed?: boolean;
+    uninstallPrevious?: boolean;
+    allowElevate?: boolean;
+    excludeRoots?: string[];
+    logDir?: string;
+}
+export interface ManagedMsiInstallPlan {
+    ok: boolean;
+    msiPath: string;
+    runningProcesses: RunningNewmarkProcess[];
+    installedProducts: InstalledNewmarkProduct[];
+    legacyExecutables: string[];
+    needsStopConfirmation: boolean;
+    needsLegacyRemovalConfirmation: boolean;
+    error?: string;
+}
+export interface ManagedMsiInstallResult {
+    ok: boolean;
+    plan: ManagedMsiInstallPlan;
+    stopped: number[];
+    uninstalled: string[];
+    removedLegacy: string[];
+    exitCode?: number;
+    logPath?: string;
+    error?: string;
+}
+export declare function listRunningNewmarkProcesses(): RunningNewmarkProcess[];
+export declare function stopNewmarkProcesses(pids: number[]): {
+    stopped: number[];
+    errors: string[];
+};
+export declare function listInstalledNewmarkProducts(): InstalledNewmarkProduct[];
+export declare function uninstallNewmarkProduct(productCode: string, logPath: string): {
+    ok: boolean;
+    exitCode: number;
+    logPath: string;
+    error?: string;
+};
+export declare function installMsiPackage(msiPath: string, options?: {
+    logDir?: string;
+    allowElevate?: boolean;
+}): {
+    ok: boolean;
+    exitCode: number;
+    logPath: string;
+    error?: string;
+};
+export declare function findLegacyNewmarkExecutables(excludeRoots?: string[]): string[];
+export declare function removeLegacyNewmarkExecutables(paths: string[]): {
+    removed: string[];
+    errors: string[];
+};
+export declare function planManagedMsiInstall(msiPath: string, options?: ManagedMsiInstallOptions): ManagedMsiInstallPlan;
+export declare function executeManagedMsiInstall(msiPath: string, options?: ManagedMsiInstallOptions): ManagedMsiInstallResult;
 //# sourceMappingURL=installUpdate.d.ts.map