caplets 0.17.1 → 0.17.2

package/README.md

@@ -77,16 +77,18 @@ You can also invoke configured Caplets directly from the CLI for agent-friendly
 ```sh
 caplets get-caplet context7
 caplets list-tools context7
-caplets get-tool context7.resolve-library-id
-caplets call-tool context7.resolve-library-id --args '{"libraryName":"react"}'
-caplets call-tool context7.resolve-library-id --args '{"libraryName":"react"}' --field result.id --format json
+caplets get-tool context7 resolve-library-id
+caplets call-tool context7 resolve-library-id --args '{"libraryName":"react"}'
+caplets call-tool context7 resolve-library-id --args '{"libraryName":"react"}' --field result.id --format json
 caplets list-resources docs
 caplets read-resource docs file:///repo/README.md
 caplets list-prompts linear
-caplets get-prompt linear.review_issue --args '{"issueId":"CAP-123"}'
+caplets get-prompt linear review_issue --args '{"issueId":"CAP-123"}'
 caplets complete docs --resource-template 'file:///repo/{path}' --argument path --value src/
 ```
 
+The older qualified form, such as `caplets call-tool context7.resolve-library-id` or `caplets get-prompt linear.review_issue`, remains supported for scripts and existing usage.
+
 Direct CLI operation commands print Markdown summaries by default. Add `--format plain` for plain text or `--format json` for machine-readable JSON (`md` is accepted as an alias for `markdown`). If a downstream tool returns `isError: true`, Caplets still exits with status code 1.
 
 ### Shell completions
@@ -117,7 +119,7 @@ caplets completion cmd > %USERPROFILE%\caplets-completion.cmd
 %USERPROFILE%\caplets-completion.cmd
 ```
 
-Completions include command names, options, common enum values, configured Caplet IDs, and cache-backed downstream names for qualified targets such as `caplets call-tool repo.<TAB>`. Downstream discovery is bounded by the `completion` config timeouts and a platform-native cache directory. Generated shell scripts suppress completion stderr; run the underlying CLI command directly when debugging completion behavior.
+Completions include command names, options, common enum values, configured Caplet IDs, and cache-backed downstream names for split targets such as `caplets call-tool repo <TAB>` and qualified targets such as `caplets call-tool repo.<TAB>`. Downstream discovery is bounded by the `completion` config timeouts and a platform-native cache directory. Generated shell scripts suppress completion stderr; run the underlying CLI command directly when debugging completion behavior.
 
 Backends that require OAuth or token auth may need `caplets auth login <server>` before live downstream completions can return richer results. Completion never starts interactive login flows.
 

package/dist/index.js

@@ -4709,7 +4709,7 @@ function generatedToolInputJsonSchema() {
 	return generatedToolInputJsonSchemaForCaplet({ backend: "tool" });
 }
 //#endregion
-//#region ../core/dist/options-BqibJVxq.js
+//#region ../core/dist/options-bnsSREid.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -57625,7 +57625,7 @@ var CapletsEngine = class {
 		}
 	}
 	async completeCliWords(words) {
-		const { completeCliWords } = await Promise.resolve().then(() => completion_dbB1hc97_exports).then((n) => n.r);
+		const { completeCliWords } = await Promise.resolve().then(() => completion_L23s2FGB_exports).then((n) => n.r);
 		return await completeCliWords(words, {
 			config: this.registry.config,
 			managers: {
@@ -57963,8 +57963,8 @@ function hasEnv$1(value) {
 	return value !== void 0 && value.trim() !== "";
 }
 //#endregion
-//#region ../core/dist/completion-dbB1hc97.js
-var completion_dbB1hc97_exports = /* @__PURE__ */ __exportAll$1({
+//#region ../core/dist/completion-L23s2FGB.js
+var completion_L23s2FGB_exports = /* @__PURE__ */ __exportAll$1({
 	a: () => formatCapletList,
 	c: () => resolveCliConfigPaths,
 	i: () => trailingSpaceCompletionToken,
@@ -58434,9 +58434,17 @@ async function completeCliWords(words, options = {}) {
 		if (normalized.length === 1) return prefixFilter([...topLevelCommandNames], current);
 		if (normalized.length === 2 && command in cliSubcommands) return prefixFilter(cliSubcommands[command], current);
 		if (normalized.length === 2 && capletIdCommands.has(command)) return prefixFilter(promptResourceCommands.has(command) ? configuredCapletIds(options, { backend: "mcp" }) : configuredCapletIds(options), current);
-		if (normalized.length === 2 && (qualifiedToolCommands.has(command) || qualifiedPromptCommands.has(command))) {
-			if (current.includes(".")) return prefixFilter((await discoverCompletionCandidates(current.slice(0, current.indexOf(".")), qualifiedToolCommands.has(command) ? "tools" : "prompts", discoveryOptions(options))).map((candidate) => candidate.value), current);
-			return prefixFilter(configuredCapletIds(options, qualifiedPromptCommands.has(command) ? { backend: "mcp" } : void 0).map((id) => `${id}.`), current);
+		if (qualifiedToolCommands.has(command) || qualifiedPromptCommands.has(command)) {
+			const kind = qualifiedToolCommands.has(command) ? "tools" : "prompts";
+			const idFilter = qualifiedPromptCommands.has(command) ? { backend: "mcp" } : void 0;
+			if (normalized.length === 2) {
+				if (current.includes(".")) return prefixFilter((await discoverCompletionCandidates(current.slice(0, current.indexOf(".")), kind, discoveryOptions(options))).map((candidate) => candidate.value), current);
+				return prefixFilter(configuredCapletIds(options, idFilter), current);
+			}
+			if (normalized.length === 3 && subcommand && !subcommand.includes(".")) {
+				if (current.startsWith("-")) return [];
+				return prefixFilter((await discoverCompletionCandidates(subcommand, kind, discoveryOptions(options))).map((candidate) => candidate.value.replace(`${subcommand}.`, "")), current);
+			}
 		}
 		if (command === cliCommands.readResource && normalized.length === 3) return prefixFilter((await discoverCompletionCandidates(subcommand, "resources", discoveryOptions(options))).map((candidate) => candidate.value), current);
 		if (command === cliCommands.auth && ["login", "logout"].includes(subcommand) && normalized.length === 3) return prefixFilter(configuredCapletIds(options), current);
@@ -59819,7 +59827,7 @@ const EMPTY_COMPLETION_RESULT = { completion: {
 	values: [],
 	hasMore: false
 } };
-var version$1 = "0.18.1";
+var version$1 = "0.18.2";
 var CapletsMcpSession = class {
 	engine;
 	server;
@@ -67491,7 +67499,7 @@ function createHttpServeApp(options, engine, io = {}) {
 				}
 			});
 		}
-		return c.json(await dispatchRemoteCliRequest(request, controlContext(io, writeErr, authFlowStore, c.req.url, paths.control, options.trustProxy, (name) => c.req.header(name))));
+		return c.json(await dispatchRemoteCliRequest(request, controlContext(io, writeErr, authFlowStore, c.req.url, paths.control, options.publicOrigin, options.trustProxy, (name) => c.req.header(name))));
 	});
 	app.get(routePath(paths.control, "auth/callback/:flowId"), async (c) => {
 		const flowId = c.req.param("flowId");
@@ -67501,7 +67509,7 @@ function createHttpServeApp(options, engine, io = {}) {
 				flowId,
 				callbackUrl: c.req.url
 			}
-		}, controlContext(io, writeErr, authFlowStore, c.req.url, paths.control, options.trustProxy, (name) => c.req.header(name)));
+		}, controlContext(io, writeErr, authFlowStore, c.req.url, paths.control, options.publicOrigin, options.trustProxy, (name) => c.req.header(name)));
 		if (!result.ok) writeErr(`Caplets authentication failed for flow ${flowId}: ${result.error.message}\n`);
 		return result.ok ? c.text("Caplets authentication complete. You can return to your terminal.") : c.text("Caplets authentication failed. Check server logs for details.", 400);
 	});
@@ -67515,12 +67523,12 @@ function createHttpServeApp(options, engine, io = {}) {
 	if (options.warnUnauthenticatedNetwork) writeErr(`Warning: Caplets MCP HTTP server is listening on ${options.host} without authentication.\n`);
 	return app;
 }
-function controlContext(io, writeErr, authFlowStore, requestUrl, controlPath, trustProxy, header) {
+function controlContext(io, writeErr, authFlowStore, requestUrl, controlPath, publicOrigin, trustProxy, header) {
 	return {
 		...io.control,
 		projectCapletsRoot: io.control?.projectCapletsRoot ?? resolveProjectCapletsRoot(),
 		authFlowStore,
-		controlCallbackBaseUrl: new URL(controlPath, publicRequestOrigin(requestUrl, trustProxy, header)).toString(),
+		controlCallbackBaseUrl: new URL(controlPath, publicOrigin ?? publicRequestOrigin(requestUrl, trustProxy, header)).toString(),
 		writeErr
 	};
 }
@@ -67685,6 +67693,7 @@ function resolveServeOptions(raw, env = process.env) {
 		host,
 		port,
 		path,
+		...serverUrl ? { publicOrigin: serverUrl.origin } : {},
 		auth,
 		warnUnauthenticatedNetwork: !loopback && !auth.enabled,
 		loopback,
@@ -67874,9 +67883,12 @@ function createProgram(io = {}) {
 			suggestions = remote ? await remote.request("complete_cli", {
 				shell,
 				words: completionWords
-			}) : await completeCliWords(completionWords, configPath ? { configPath } : {});
+			}) : await completeCliWordsLocally(completionWords, {
+				...configPath ? { configPath } : {},
+				...io.authDir ? { authDir: io.authDir } : {}
+			});
 		} catch {
-			suggestions = [];
+			suggestions = remote ? [] : await completeCliWords(completionWords, configPath ? { configPath } : {});
 		}
 		if (suggestions.length > 0) writeOut(`${suggestions.join("\n")}\n`);
 	});
@@ -68070,8 +68082,8 @@ function createProgram(io = {}) {
 			format: options.format
 		});
 	});
-	program.command(cliCommands.getTool).description("Print one downstream tool schema.").argument("<caplet.tool>", "qualified target, split on the first dot").option("--format <format>", "output format: markdown, md, plain, or json", parseOutputFormat).action(async (target, options) => {
-		const { caplet, tool } = parseQualifiedTarget(target);
+	program.command(cliCommands.getTool).description("Print one downstream tool schema.").argument("<caplet-or-target>", "Caplet ID or qualified <caplet.tool> target").argument("[tool]", "downstream tool name when caplet is provided separately").option("--format <format>", "output format: markdown, md, plain, or json", parseOutputFormat).action(async (capletOrTarget, toolArgument, options) => {
+		const { caplet, tool } = parseQualifiedTarget(capletOrTarget, toolArgument);
 		await executeOperation(caplet, {
 			operation: "get_tool",
 			tool
@@ -68085,8 +68097,8 @@ function createProgram(io = {}) {
 			format: options.format
 		});
 	});
-	program.command(cliCommands.callTool).description("Call one downstream tool.").argument("<caplet.tool>", "qualified target, split on the first dot").option("--args <json-object>", "JSON object of downstream tool arguments").option("--field <path>", "project a field from structured output", collect, []).option("--format <format>", "output format: markdown, md, plain, or json", parseOutputFormat).action(async (target, options) => {
-		const { caplet, tool } = parseQualifiedTarget(target);
+	program.command(cliCommands.callTool).description("Call one downstream tool.").argument("<caplet-or-target>", "Caplet ID or qualified <caplet.tool> target").argument("[tool]", "downstream tool name when caplet is provided separately").option("--args <json-object>", "JSON object of downstream tool arguments").option("--field <path>", "project a field from structured output", collect, []).option("--format <format>", "output format: markdown, md, plain, or json", parseOutputFormat).action(async (capletOrTarget, toolArgument, options) => {
+		const { caplet, tool } = parseQualifiedTarget(capletOrTarget, toolArgument);
 		await executeOperation(caplet, {
 			operation: "call_tool",
 			tool,
@@ -68182,8 +68194,8 @@ function createProgram(io = {}) {
 		remote: remoteClientForCli(io),
 		format: options.format
 	}));
-	program.command(cliCommands.getPrompt).description("Get one MCP prompt by name.").argument("<caplet.prompt>", "qualified target, split on the first dot").option("--args <json-object>", "JSON object of prompt arguments").option("--format <format>", "output format: markdown, md, plain, or json", parseOutputFormat).action(async (target, options) => {
-		const { caplet, tool: prompt } = parseQualifiedTarget(target);
+	program.command(cliCommands.getPrompt).description("Get one MCP prompt by name.").argument("<caplet-or-target>", "MCP Caplet ID or qualified <caplet.prompt> target").argument("[prompt]", "prompt name when caplet is provided separately").option("--args <json-object>", "JSON object of prompt arguments").option("--format <format>", "output format: markdown, md, plain, or json", parseOutputFormat).action(async (capletOrTarget, promptArgument, options) => {
+		const { caplet, tool: prompt } = parseQualifiedTarget(capletOrTarget, promptArgument);
 		await executeOperation(caplet, {
 			operation: "get_prompt",
 			prompt,
@@ -68348,14 +68360,33 @@ function parseOutputFormat(value) {
 		default: throw new CapletsError("REQUEST_INVALID", `Expected output format markdown, md, plain, or json; got ${value}`);
 	}
 }
-function parseQualifiedTarget(target) {
-	const dot = target.indexOf(".");
-	if (dot <= 0 || dot === target.length - 1) throw new CapletsError("REQUEST_INVALID", "Expected qualified target in the form <caplet>.<tool>");
+function parseQualifiedTarget(capletOrTarget, toolArgument) {
+	if (toolArgument !== void 0) {
+		if (capletOrTarget.length === 0 || toolArgument.length === 0) throw new CapletsError("REQUEST_INVALID", "Expected target in the form <caplet> <tool> or <caplet>.<tool>");
+		return {
+			caplet: capletOrTarget,
+			tool: toolArgument
+		};
+	}
+	const dot = capletOrTarget.indexOf(".");
+	if (dot <= 0 || dot === capletOrTarget.length - 1) throw new CapletsError("REQUEST_INVALID", "Expected target in the form <caplet> <tool> or <caplet>.<tool>");
 	return {
-		caplet: target.slice(0, dot),
-		tool: target.slice(dot + 1)
+		caplet: capletOrTarget.slice(0, dot),
+		tool: capletOrTarget.slice(dot + 1)
 	};
 }
+async function completeCliWordsLocally(words, options) {
+	const engine = new CapletsEngine({
+		...options.configPath ? { configPath: options.configPath } : {},
+		...options.authDir ? { authDir: options.authDir } : {},
+		watch: false
+	});
+	try {
+		return await engine.completeCliWords(words);
+	} finally {
+		await engine.close();
+	}
+}
 function parseCallToolArgs(value) {
 	if (value === void 0) return {};
 	let parsed;
@@ -68780,7 +68811,7 @@ function writeAddResult(writeOut, label, result) {
 }
 //#endregion
 //#region package.json
-var version = "0.17.1";
+var version = "0.17.2";
 //#endregion
 //#region src/index.ts
 async function main() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "caplets",
-  "version": "0.17.1",
+  "version": "0.17.2",
   "description": "Progressive disclosure gateway CLI for MCP servers and native Caplets adapters.",
   "keywords": [
     "caplets",
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "@caplets/core": "0.18.1"
+    "@caplets/core": "0.18.2"
   },
   "devDependencies": {
     "@types/node": "^25.9.1",