dsh-tiddlywiki 0.6.0 → 0.7.3

package/lib/index.js

@@ -852,6 +852,151 @@ function registerRoutes(ctx, deps) {
 			ui: deps.uiDefaults()
 		});
 	};
+	/**
+	* GET /dsh-tiddlywiki/agent/sessions — visible ordinary sessions for the TW
+	* one-click picker (excludes subagent sessions, activity-descending).
+	*/
+	const handleAgentSessions = async (_req, res) => {
+		try {
+			const sc = deps.getSessionController();
+			if (sc === void 0) {
+				json$1(res, {
+					ok: false,
+					error: "session service unavailable"
+				}, 503);
+				return;
+			}
+			json$1(res, {
+				ok: true,
+				items: ((await sc.list({}, AbortSignal.timeout(1e4))).items ?? []).filter((s) => s.parentSessionId === void 0).map((s) => ({
+					sessionId: s.sessionId,
+					cwd: s.cwd ?? null,
+					running: !!s.running,
+					blank: !!s.blank,
+					updatedAt: s.updatedAt ?? 0
+				})).sort((a, b) => b.updatedAt - a.updatedAt)
+			});
+		} catch (err) {
+			json$1(res, {
+				ok: false,
+				error: err instanceof Error ? err.message : String(err)
+			}, 500);
+		}
+	};
+	/**
+	* POST /dsh-tiddlywiki/agent/send — deliver a note to one agent session as a
+	* queued user message (sessionController.prompt, the same API the GUI chat
+	* input uses). Guards: feature switch, optional shared token, body shape.
+	*/
+	const handleAgentSend = async (req, res) => {
+		try {
+			if (!deps.sendToAgentEnabled()) {
+				json$1(res, {
+					ok: false,
+					error: "send-to-agent is disabled"
+				}, 403);
+				return;
+			}
+			const token = deps.sendToAgentToken().trim();
+			if (token.length > 0) {
+				const got = req.headers["x-send-to-agent-token"];
+				if ((typeof got === "string" ? got : Array.isArray(got) ? got[0] ?? "" : "") !== token) {
+					json$1(res, {
+						ok: false,
+						error: "unauthorized"
+					}, 401);
+					return;
+				}
+			}
+			const body = JSON.parse(await readBody$1(req));
+			const sessionId = typeof body.sessionId === "string" && body.sessionId.trim().length > 0 ? body.sessionId.trim() : "";
+			const text = typeof body.text === "string" && body.text.trim().length > 0 ? body.text.trim() : "";
+			if (sessionId.length === 0 || text.length === 0) {
+				json$1(res, {
+					ok: false,
+					error: "sessionId and text are required"
+				}, 400);
+				return;
+			}
+			const sc = deps.getSessionController();
+			if (sc === void 0) {
+				json$1(res, {
+					ok: false,
+					error: "session service unavailable"
+				}, 503);
+				return;
+			}
+			const requestId = `tw-send-${Date.now()}-${Math.random().toString(36).slice(2, 10)}`;
+			await sc.prompt({
+				requestId,
+				sessionId,
+				mode: "queue",
+				content: [{
+					type: "text",
+					text
+				}]
+			}, AbortSignal.timeout(2e4));
+			json$1(res, {
+				ok: true,
+				requestId,
+				sessionId
+			});
+		} catch (err) {
+			json$1(res, {
+				ok: false,
+				error: err instanceof Error ? err.message : String(err)
+			}, 500);
+		}
+	};
+	/**
+	* POST /dsh-tiddlywiki/agent/create — create (or adopt) one ordinary session,
+	* optionally inside a workspace path. The picker uses it for "new workspace /
+	* new session"; the created session's cwd becomes its workspace. The directory
+	* is materialised so a brand-new workspace actually exists on disk.
+	*/
+	const handleAgentCreate = async (req, res) => {
+		try {
+			if (!deps.sendToAgentEnabled()) {
+				json$1(res, {
+					ok: false,
+					error: "send-to-agent is disabled"
+				}, 403);
+				return;
+			}
+			const token = deps.sendToAgentToken().trim();
+			if (token.length > 0) {
+				const got = req.headers["x-send-to-agent-token"];
+				if ((typeof got === "string" ? got : Array.isArray(got) ? got[0] ?? "" : "") !== token) {
+					json$1(res, {
+						ok: false,
+						error: "unauthorized"
+					}, 401);
+					return;
+				}
+			}
+			const body = JSON.parse(await readBody$1(req));
+			const cwd = typeof body.cwd === "string" ? body.cwd.trim() : "";
+			const sc = deps.getSessionController();
+			if (sc === void 0) {
+				json$1(res, {
+					ok: false,
+					error: "session service unavailable"
+				}, 503);
+				return;
+			}
+			if (cwd.length > 0) await mkdir(cwd, { recursive: true });
+			json$1(res, {
+				ok: true,
+				sessionId: (await sc.create({ cwd: cwd.length > 0 ? cwd : void 0 })).sessionId,
+				cwd: cwd || null
+			});
+		} catch (err) {
+			json$1(res, {
+				ok: false,
+				error: err instanceof Error ? err.message : String(err)
+			}, 500);
+		}
+	};
 	const handleNote = async (req, res) => {
 		try {
 			const body = JSON.parse(await readBody$1(req));
@@ -1311,6 +1456,27 @@ function registerRoutes(ctx, deps) {
 				handleRestart(req, res);
 			}
 		}),
+		ctx.webServer.register({
+			kind: "exact",
+			path: `${ROUTE_PREFIX}/agent/sessions`,
+			handler: (req, res) => {
+				handleAgentSessions(req, res);
+			}
+		}),
+		ctx.webServer.register({
+			kind: "exact",
+			path: `${ROUTE_PREFIX}/agent/send`,
+			handler: (req, res) => {
+				handleAgentSend(req, res);
+			}
+		}),
+		ctx.webServer.register({
+			kind: "exact",
+			path: `${ROUTE_PREFIX}/agent/create`,
+			handler: (req, res) => {
+				handleAgentCreate(req, res);
+			}
+		}),
 		ctx.webServer.register({
 			kind: "prefix",
 			path: `${ROUTE_PREFIX}/api`,
@@ -2640,7 +2806,10 @@ function registerTiddlywikiTools(ctx, deps) {
 					}
 				}
 			}
-			await wiki.put(cleanTiddler(existing));
+			await wiki.put({
+				...cleanTiddler(existing),
+				title: newTitle
+			});
 			await wiki.delete(oldTitle);
 			if (refsTiddlers === 0) warning = "未找到任何其他 tiddler 引用旧标题；如确实需要，可手动补充链接。";
 			deps.autoCommit();
@@ -2924,7 +3093,8 @@ const DEFAULTS = {
 	ui: {
 		showQuickNote: true,
 		showPanelStatus: true,
-		showSyncButton: true
+		showSyncButton: true,
+		sendToAgent: { enabled: true }
 	},
 	auth: {
 		username: "",
@@ -3164,6 +3334,7 @@ function apply(ctx, rawConfig = {}) {
 	})();
 	ctx.inject(["webServer"], (webCtx) => {
 		const ws = webCtx.webServer;
+		const getSessionController = () => ctx.get("sessionController");
 		const disposeRoutes = registerRoutes({ webServer: ws }, {
 			server,
 			getClient: client,
@@ -3171,7 +3342,13 @@ function apply(ctx, rawConfig = {}) {
 			autoCommit: () => committer?.touch(),
 			noteDefaults: () => ({ tag: effectiveNoteTag() }),
 			uiDefaults: () => effectiveUi(),
-			getWikiPath: () => wikiPath
+			getWikiPath: () => wikiPath,
+			getSessionController,
+			sendToAgentEnabled: () => eff().ui?.sendToAgent?.enabled !== false,
+			sendToAgentToken: () => {
+				const token = eff().ui?.sendToAgent?.token;
+				return typeof token === "string" ? token : "";
+			}
 		});
 		const disposeAdmin = registerAdminRoutes({ webServer: ws }, {
 			server,
@@ -3196,6 +3373,6 @@ function apply(ctx, rawConfig = {}) {
 	}, "dsh-tiddlywiki: host teardown");
 }
 //#endregion
-export { AutoCommitter, ConfigStore, DOC_NOTE_TAG, DOC_NOTE_TEXT, DOC_NOTE_TITLE, GitFace, PATH_PREFIX, TW_PROXY_PATH, TW_PROXY_PREFIX, TW_WEB_HOST_TIDDLER, TiddlyWebClient, WikiServer, apply, bundledCatalog, deepMerge, defineTool, dshHomePath, ensureLanguage, ensureTwWebHost, inject, name, normalizeThemes, openInTwEditor, readWikiInfo, registerAdminRoutes, registerRoutes, resolveTwRoot, seedDocNote, writeWikiInfo };
+export { AutoCommitter, ConfigStore, DOC_NOTE_TAG, DOC_NOTE_TEXT, DOC_NOTE_TITLE, GitFace, PATH_PREFIX, TW_PROXY_PATH, TW_PROXY_PREFIX, TW_WEB_HOST_TIDDLER, TiddlyWebClient, WikiServer, apply, bundledCatalog, deepMerge, defineTool, dshHomePath, ensureLanguage, ensureTwWebHost, inject, name, normalizeThemes, openInTwEditor, readWikiInfo, registerAdminRoutes, registerRoutes, registerTiddlywikiTools, resolveTwRoot, seedDocNote, writeWikiInfo };
 
 //# sourceMappingURL=index.js.map