@acprompt/join 0.1.4 → 0.1.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/install.d.ts +14 -1
- package/dist/commands/install.d.ts.map +1 -1
- package/dist/commands/install.js +22 -9
- package/dist/commands/install.js.map +1 -1
- package/dist/index.js +14 -6
- package/dist/index.js.map +1 -1
- package/dist/install/claude-code.d.ts +9 -0
- package/dist/install/claude-code.d.ts.map +1 -1
- package/dist/install/claude-code.js +48 -5
- package/dist/install/claude-code.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,2 +1,15 @@
|
|
|
1
|
-
export
|
|
1
|
+
export interface InstallOptions {
|
|
2
|
+
/** Skip all confirm prompts, accepting defaults. Required for non-TTY. */
|
|
3
|
+
yes?: boolean;
|
|
4
|
+
}
|
|
5
|
+
/**
|
|
6
|
+
* Resolve a yes/no from the user.
|
|
7
|
+
* - If `yes` is set, accept the default without prompting.
|
|
8
|
+
* - If stdin is not a TTY and `yes` is not set, throw a clear error rather
|
|
9
|
+
* than letting `@inquirer/prompts` silently resolve `null` and exit(1).
|
|
10
|
+
*
|
|
11
|
+
* Exported for testing — prod code calls it through `runInstall`.
|
|
12
|
+
*/
|
|
13
|
+
export declare function askYesNo(message: string, defaultValue: boolean, opts: InstallOptions): Promise<boolean>;
|
|
14
|
+
export declare function runInstall(opts?: InstallOptions): Promise<void>;
|
|
2
15
|
//# sourceMappingURL=install.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":"AAuBA,wBAAsB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":"AAuBA,MAAM,WAAW,cAAc;IAC7B,0EAA0E;IAC1E,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED;;;;;;;GAOG;AACH,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,OAAO,CAAC,CASlB;AAED,wBAAsB,UAAU,CAAC,IAAI,GAAE,cAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAsFzE"}
|
package/dist/commands/install.js
CHANGED
|
@@ -15,8 +15,27 @@ import { getToken, maskToken } from "../auth/token-store.js";
|
|
|
15
15
|
import { loadOrCreateIdentity } from "../identity/keypair.js";
|
|
16
16
|
import { getInstaller, DEFAULT_MCP_URL } from "../install/index.js";
|
|
17
17
|
import { runVerify } from "./verify.js";
|
|
18
|
-
|
|
18
|
+
/**
|
|
19
|
+
* Resolve a yes/no from the user.
|
|
20
|
+
* - If `yes` is set, accept the default without prompting.
|
|
21
|
+
* - If stdin is not a TTY and `yes` is not set, throw a clear error rather
|
|
22
|
+
* than letting `@inquirer/prompts` silently resolve `null` and exit(1).
|
|
23
|
+
*
|
|
24
|
+
* Exported for testing — prod code calls it through `runInstall`.
|
|
25
|
+
*/
|
|
26
|
+
export async function askYesNo(message, defaultValue, opts) {
|
|
27
|
+
if (opts.yes)
|
|
28
|
+
return defaultValue;
|
|
29
|
+
if (!process.stdin.isTTY) {
|
|
30
|
+
throw new Error("Non-interactive environment detected (stdin is not a TTY). " +
|
|
31
|
+
"Re-run with --yes to accept defaults, or run in a terminal.");
|
|
32
|
+
}
|
|
33
|
+
return await confirm({ message, default: defaultValue });
|
|
34
|
+
}
|
|
35
|
+
export async function runInstall(opts = {}) {
|
|
19
36
|
console.log(pc.bold("ACPrompt installer"));
|
|
37
|
+
if (opts.yes)
|
|
38
|
+
console.log(pc.dim(" --yes: accepting all defaults"));
|
|
20
39
|
console.log("");
|
|
21
40
|
const ctx = currentContext();
|
|
22
41
|
const detections = await Promise.all(ALL_DETECTORS.map((d) => d.detect(ctx)));
|
|
@@ -36,10 +55,7 @@ export async function runInstall() {
|
|
|
36
55
|
console.log(pc.dim(`Reusing stored token (${maskToken(cfg.token)}).`));
|
|
37
56
|
}
|
|
38
57
|
else {
|
|
39
|
-
const ok = await
|
|
40
|
-
message: "Open browser to approve an ACPrompt owner token?",
|
|
41
|
-
default: true,
|
|
42
|
-
});
|
|
58
|
+
const ok = await askYesNo("Open browser to approve an ACPrompt owner token?", true, opts);
|
|
43
59
|
if (!ok) {
|
|
44
60
|
console.log(pc.yellow("Aborted. Rerun when ready."));
|
|
45
61
|
return;
|
|
@@ -58,10 +74,7 @@ export async function runInstall() {
|
|
|
58
74
|
const isFileWriter = best.harness === "claude-code" || best.harness === "letta";
|
|
59
75
|
if (isFileWriter) {
|
|
60
76
|
const target = best.configTargets?.[0] ?? "its default config path";
|
|
61
|
-
const ok = await
|
|
62
|
-
message: `Write ACPrompt MCP server entry into ${target}?`,
|
|
63
|
-
default: true,
|
|
64
|
-
});
|
|
77
|
+
const ok = await askYesNo(`Write ACPrompt MCP server entry into ${target}?`, true, opts);
|
|
65
78
|
if (!ok) {
|
|
66
79
|
console.log(pc.yellow("Skipped auto-write. Run `acprompt-join install` again when ready, or paste the manual snippet below:"));
|
|
67
80
|
// Fall through to generic installer to print a manual snippet.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,EAAE;AACF,QAAQ;AACR,yCAAyC;AACzC,0DAA0D;AAC1D,2CAA2C;AAC3C,qEAAqE;AACrE,6DAA6D;AAC7D,qBAAqB;AAErB,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EACL,aAAa,EACb,cAAc,GAEf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -15,12 +15,13 @@ const program = new Command();
|
|
|
15
15
|
program
|
|
16
16
|
.name("acprompt-join")
|
|
17
17
|
.description("Smart installer for ACPrompt — wire any agent harness into the ACPrompt network via MCP.")
|
|
18
|
-
.version("0.1.
|
|
18
|
+
.version("0.1.6");
|
|
19
19
|
program
|
|
20
20
|
.command("install")
|
|
21
21
|
.description("Interactive: detect harness, mint token, write config, verify.")
|
|
22
|
-
.
|
|
23
|
-
|
|
22
|
+
.option("-y, --yes", "Accept all confirm prompts; required for non-TTY environments (CI, piped shells, background tasks).")
|
|
23
|
+
.action(async (options) => {
|
|
24
|
+
await runInstall({ yes: Boolean(options.yes) });
|
|
24
25
|
});
|
|
25
26
|
program
|
|
26
27
|
.command("detect")
|
|
@@ -40,9 +41,16 @@ program
|
|
|
40
41
|
.action(async () => {
|
|
41
42
|
await runWhoami();
|
|
42
43
|
});
|
|
43
|
-
// Default to `install` when no sub-command is passed.
|
|
44
|
-
|
|
45
|
-
|
|
44
|
+
// Default to `install` when no sub-command is passed. We also handle
|
|
45
|
+
// `npx @acprompt/join -y` / `--yes` as a shorthand for `install --yes`,
|
|
46
|
+
// since that's the documented escape hatch for non-TTY invocations.
|
|
47
|
+
const subcommands = new Set(["install", "detect", "verify", "whoami", "help", "--help", "-h", "--version", "-V"]);
|
|
48
|
+
const firstArg = process.argv[2];
|
|
49
|
+
const isBareInvocation = process.argv.length <= 2 || !subcommands.has(firstArg ?? "");
|
|
50
|
+
if (isBareInvocation) {
|
|
51
|
+
const rest = process.argv.slice(2);
|
|
52
|
+
const yes = rest.includes("-y") || rest.includes("--yes");
|
|
53
|
+
runInstall({ yes }).catch((err) => {
|
|
46
54
|
console.error(err.message);
|
|
47
55
|
process.exit(1);
|
|
48
56
|
});
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,8BAA8B;AAC9B,EAAE;AACF,gBAAgB;AAChB,mEAAmE;AACnE,gDAAgD;AAChD,yDAAyD;AACzD,yDAAyD;AAEzD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,OAAO;KACJ,IAAI,CAAC,eAAe,CAAC;KACrB,WAAW,CAAC,0FAA0F,CAAC;KACvG,OAAO,CAAC,OAAO,CAAC,CAAC;AAEpB,OAAO;KACJ,OAAO,CAAC,SAAS,CAAC;KAClB,WAAW,CAAC,gEAAgE,CAAC;KAC7E,MAAM,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,12 @@
|
|
|
1
1
|
import type { HarnessInstaller } from "./shared.js";
|
|
2
|
+
/**
|
|
3
|
+
* Build the Claude-Desktop-compatible MCP server entry for ACPrompt. See
|
|
4
|
+
* the file-top comment for why this shape (and not `{type:"http",...}`).
|
|
5
|
+
* Exported for unit testing.
|
|
6
|
+
*/
|
|
7
|
+
export declare function buildClaudeDesktopEntry(opts: {
|
|
8
|
+
mcpUrl: string;
|
|
9
|
+
token: string;
|
|
10
|
+
}): Record<string, unknown>;
|
|
2
11
|
export declare const claudeCodeInstaller: HarnessInstaller;
|
|
3
12
|
//# sourceMappingURL=claude-code.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-code.d.ts","sourceRoot":"","sources":["../../src/install/claude-code.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"claude-code.d.ts","sourceRoot":"","sources":["../../src/install/claude-code.ts"],"names":[],"mappings":"AA0CA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAGpD;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAW1B;AAmBD,eAAO,MAAM,mBAAmB,EAAE,gBA4CjC,CAAC"}
|
|
@@ -8,10 +8,55 @@
|
|
|
8
8
|
//
|
|
9
9
|
// We always try (1) if a config path is known. If the user ALSO has the
|
|
10
10
|
// CLI, we print the CLI hint after the file write as a second option.
|
|
11
|
+
//
|
|
12
|
+
// ============================================================================
|
|
13
|
+
// Claude Desktop config-shape trap (F6, 2026-04-20)
|
|
14
|
+
// ============================================================================
|
|
15
|
+
// Claude Desktop (Electron app) does NOT support the native `{type:"http",
|
|
16
|
+
// url, headers}` MCP shape that Claude Code CLI accepts. As of Apr 2026 the
|
|
17
|
+
// Desktop app is stdio-only; remote HTTP MCP servers must go through the
|
|
18
|
+
// `mcp-remote` shim which the Desktop app spawns as a local child process.
|
|
19
|
+
//
|
|
20
|
+
// v0.1.0–v0.1.5 wrote the Claude Code CLI shape into the Desktop config and
|
|
21
|
+
// Desktop silently skipped the entry with a dialog reading: "Some MCP
|
|
22
|
+
// servers could not be loaded — The following entries in
|
|
23
|
+
// claude_desktop_config.json are not valid MCP server configurations and
|
|
24
|
+
// were skipped: acprompt". No MCP tools surfaced inside Claude Desktop.
|
|
25
|
+
//
|
|
26
|
+
// Fix (v0.1.6): emit the `command: "npx"` + `args: [mcp-remote, url,
|
|
27
|
+
// --header, "Authorization:Bearer <token>"]` shape.
|
|
28
|
+
//
|
|
29
|
+
// Windows-safety notes baked into this shape:
|
|
30
|
+
// - Header separator is `:` with NO space before the value (mcp-remote
|
|
31
|
+
// splits on first colon, then trims). A missing space doesn't break
|
|
32
|
+
// HTTP parsing on the server side (RFC 7230 says OWS is optional).
|
|
33
|
+
// - Token is inlined in `args`, not substituted via `${ENV}` — Claude
|
|
34
|
+
// Desktop doesn't document env-var substitution in args, and relying on
|
|
35
|
+
// mcp-remote's internal substitution would make the config brittle
|
|
36
|
+
// across mcp-remote versions.
|
|
37
|
+
// - `-y` on npx auto-accepts the on-disk install prompt so first run
|
|
38
|
+
// doesn't hang waiting for stdin.
|
|
11
39
|
import pc from "picocolors";
|
|
12
40
|
import { promises as fs } from "node:fs";
|
|
13
41
|
import path from "node:path";
|
|
14
42
|
import { claudeDesktopConfigPath } from "../detect/claude-code.js";
|
|
43
|
+
/**
|
|
44
|
+
* Build the Claude-Desktop-compatible MCP server entry for ACPrompt. See
|
|
45
|
+
* the file-top comment for why this shape (and not `{type:"http",...}`).
|
|
46
|
+
* Exported for unit testing.
|
|
47
|
+
*/
|
|
48
|
+
export function buildClaudeDesktopEntry(opts) {
|
|
49
|
+
return {
|
|
50
|
+
command: "npx",
|
|
51
|
+
args: [
|
|
52
|
+
"-y",
|
|
53
|
+
"mcp-remote",
|
|
54
|
+
opts.mcpUrl,
|
|
55
|
+
"--header",
|
|
56
|
+
`Authorization:Bearer ${opts.token}`,
|
|
57
|
+
],
|
|
58
|
+
};
|
|
59
|
+
}
|
|
15
60
|
async function mergeConfig(configPath, entry) {
|
|
16
61
|
let current = {};
|
|
17
62
|
try {
|
|
@@ -36,16 +81,14 @@ export const claudeCodeInstaller = async (ic) => {
|
|
|
36
81
|
platform: ic.platform,
|
|
37
82
|
env: process.env,
|
|
38
83
|
});
|
|
39
|
-
const entry = {
|
|
40
|
-
type: "http",
|
|
41
|
-
url: ic.mcpUrl,
|
|
42
|
-
headers: { Authorization: `Bearer ${ic.token}` },
|
|
43
|
-
};
|
|
84
|
+
const entry = buildClaudeDesktopEntry({ mcpUrl: ic.mcpUrl, token: ic.token });
|
|
44
85
|
if (!ic.dryRun) {
|
|
45
86
|
await mergeConfig(configPath, entry);
|
|
46
87
|
}
|
|
47
88
|
wrote.push(configPath);
|
|
48
89
|
console.log(pc.green(`Wrote ACPrompt MCP server entry to ${configPath}.`));
|
|
90
|
+
console.log(pc.dim(" Shape: mcp-remote stdio shim (Claude Desktop does not accept native HTTP MCP yet)."));
|
|
91
|
+
console.log(pc.dim(" Restart Claude Desktop to load the new server."));
|
|
49
92
|
const cliHit = (ic.detection.evidence ?? []).some((e) => e.includes("Claude Code CLI"));
|
|
50
93
|
if (cliHit) {
|
|
51
94
|
console.log("");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-code.js","sourceRoot":"","sources":["../../src/install/claude-code.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,EAAE;AACF,2BAA2B;AAC3B,8DAA8D;AAC9D,oEAAoE;AACpE,uEAAuE;AACvE,yEAAyE;AACzE,EAAE;AACF,wEAAwE;AACxE,sEAAsE;
|
|
1
|
+
{"version":3,"file":"claude-code.js","sourceRoot":"","sources":["../../src/install/claude-code.ts"],"names":[],"mappings":"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"}
|