@mutates/cli 2.1.0 → 2.1.2

package/src/commands/generated/source-file/get.js

@@ -5,6 +5,7 @@ const citty_1 = require("citty");
 const node_path_1 = require("node:path");
 const output_1 = require("../../../client/output");
 const rpc_client_1 = require("../../../client/rpc-client");
+const resolve_session_1 = require("../../../client/resolve-session");
 const jsonrpc_1 = require("../../../proto/jsonrpc");
 exports.default = (0, citty_1.defineCommand)({
     meta: {
@@ -24,7 +25,7 @@ exports.default = (0, citty_1.defineCommand)({
         try {
             const conn = await (0, rpc_client_1.connectClient)({ root, sessionId: args.session });
             try {
-                const sessionId = args.session ?? (await openSession(conn, root));
+                const sessionId = await (0, resolve_session_1.resolveSessionId)(conn, root, args.session);
                 const data = await readJsonArg(args.json);
                 const filter = args.filter ? JSON.parse(args.filter) : undefined;
                 const target = {};
@@ -52,10 +53,6 @@ exports.default = (0, citty_1.defineCommand)({
         }
     },
 });
-async function openSession(conn, root) {
-    const opened = await conn.call('session.open', { root });
-    return opened.sessionId;
-}
 async function readJsonArg(raw) {
     if (raw === undefined)
         return undefined;

package/src/commands/generated/source-file/get.js.map

@@ -1 +1 @@
-{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../packages/cli/src/commands/generated/source-file/get.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../packages/cli/src/commands/generated/source-file/get.ts"],"names":[],"mappings":"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"}

package/src/commands/generated/source-files/add.js

@@ -5,6 +5,7 @@ const citty_1 = require("citty");
 const node_path_1 = require("node:path");
 const output_1 = require("../../../client/output");
 const rpc_client_1 = require("../../../client/rpc-client");
+const resolve_session_1 = require("../../../client/resolve-session");
 const jsonrpc_1 = require("../../../proto/jsonrpc");
 exports.default = (0, citty_1.defineCommand)({
     meta: {
@@ -24,7 +25,7 @@ exports.default = (0, citty_1.defineCommand)({
         try {
             const conn = await (0, rpc_client_1.connectClient)({ root, sessionId: args.session });
             try {
-                const sessionId = args.session ?? (await openSession(conn, root));
+                const sessionId = await (0, resolve_session_1.resolveSessionId)(conn, root, args.session);
                 const data = await readJsonArg(args.json);
                 const filter = args.filter ? JSON.parse(args.filter) : undefined;
                 const target = {};
@@ -52,10 +53,6 @@ exports.default = (0, citty_1.defineCommand)({
         }
     },
 });
-async function openSession(conn, root) {
-    const opened = await conn.call('session.open', { root });
-    return opened.sessionId;
-}
 async function readJsonArg(raw) {
     if (raw === undefined)
         return undefined;

package/src/commands/generated/source-files/add.js.map

@@ -1 +1 @@
-{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../../../../packages/cli/src/commands/generated/source-files/add.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../../../../packages/cli/src/commands/generated/source-files/add.ts"],"names":[],"mappings":"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"}

package/src/commands/generated/source-files/get.js

@@ -5,6 +5,7 @@ const citty_1 = require("citty");
 const node_path_1 = require("node:path");
 const output_1 = require("../../../client/output");
 const rpc_client_1 = require("../../../client/rpc-client");
+const resolve_session_1 = require("../../../client/resolve-session");
 const jsonrpc_1 = require("../../../proto/jsonrpc");
 exports.default = (0, citty_1.defineCommand)({
     meta: {
@@ -24,7 +25,7 @@ exports.default = (0, citty_1.defineCommand)({
         try {
             const conn = await (0, rpc_client_1.connectClient)({ root, sessionId: args.session });
             try {
-                const sessionId = args.session ?? (await openSession(conn, root));
+                const sessionId = await (0, resolve_session_1.resolveSessionId)(conn, root, args.session);
                 const data = await readJsonArg(args.json);
                 const filter = args.filter ? JSON.parse(args.filter) : undefined;
                 const target = {};
@@ -52,10 +53,6 @@ exports.default = (0, citty_1.defineCommand)({
         }
     },
 });
-async function openSession(conn, root) {
-    const opened = await conn.call('session.open', { root });
-    return opened.sessionId;
-}
 async function readJsonArg(raw) {
     if (raw === undefined)
         return undefined;

package/src/commands/generated/source-files/get.js.map

@@ -1 +1 @@
-{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../packages/cli/src/commands/generated/source-files/get.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../packages/cli/src/commands/generated/source-files/get.ts"],"names":[],"mappings":"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"}

package/src/commands/generated/variables/add.js

@@ -5,6 +5,7 @@ const citty_1 = require("citty");
 const node_path_1 = require("node:path");
 const output_1 = require("../../../client/output");
 const rpc_client_1 = require("../../../client/rpc-client");
+const resolve_session_1 = require("../../../client/resolve-session");
 const jsonrpc_1 = require("../../../proto/jsonrpc");
 exports.default = (0, citty_1.defineCommand)({
     meta: {
@@ -24,7 +25,7 @@ exports.default = (0, citty_1.defineCommand)({
         try {
             const conn = await (0, rpc_client_1.connectClient)({ root, sessionId: args.session });
             try {
-                const sessionId = args.session ?? (await openSession(conn, root));
+                const sessionId = await (0, resolve_session_1.resolveSessionId)(conn, root, args.session);
                 const data = await readJsonArg(args.json);
                 const filter = args.filter ? JSON.parse(args.filter) : undefined;
                 const target = {};
@@ -52,10 +53,6 @@ exports.default = (0, citty_1.defineCommand)({
         }
     },
 });
-async function openSession(conn, root) {
-    const opened = await conn.call('session.open', { root });
-    return opened.sessionId;
-}
 async function readJsonArg(raw) {
     if (raw === undefined)
         return undefined;

package/src/commands/generated/variables/add.js.map

@@ -1 +1 @@
-{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../../../../packages/cli/src/commands/generated/variables/add.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../../../../packages/cli/src/commands/generated/variables/add.ts"],"names":[],"mappings":"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"}

package/src/commands/generated/variables/edit.js

@@ -5,6 +5,7 @@ const citty_1 = require("citty");
 const node_path_1 = require("node:path");
 const output_1 = require("../../../client/output");
 const rpc_client_1 = require("../../../client/rpc-client");
+const resolve_session_1 = require("../../../client/resolve-session");
 const jsonrpc_1 = require("../../../proto/jsonrpc");
 exports.default = (0, citty_1.defineCommand)({
     meta: {
@@ -24,7 +25,7 @@ exports.default = (0, citty_1.defineCommand)({
         try {
             const conn = await (0, rpc_client_1.connectClient)({ root, sessionId: args.session });
             try {
-                const sessionId = args.session ?? (await openSession(conn, root));
+                const sessionId = await (0, resolve_session_1.resolveSessionId)(conn, root, args.session);
                 const data = await readJsonArg(args.json);
                 const filter = args.filter ? JSON.parse(args.filter) : undefined;
                 const target = {};
@@ -52,10 +53,6 @@ exports.default = (0, citty_1.defineCommand)({
         }
     },
 });
-async function openSession(conn, root) {
-    const opened = await conn.call('session.open', { root });
-    return opened.sessionId;
-}
 async function readJsonArg(raw) {
     if (raw === undefined)
         return undefined;

package/src/commands/generated/variables/edit.js.map

@@ -1 +1 @@
-{"version":3,"file":"edit.js","sourceRoot":"","sources":["../../../../../../../packages/cli/src/commands/generated/variables/edit.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"edit.js","sourceRoot":"","sources":["../../../../../../../packages/cli/src/commands/generated/variables/edit.ts"],"names":[],"mappings":";;AAAA,qEAAqE;AACrE,iCAAsC;AACtC,yCAAoC;AAEpC,mDAAgF;AAChF,2DAA2D;AAC3D,qEAAmE;AACnE,oDAAkD;AAElD,kBAAe,IAAA,qBAAa,EAAC;IAC3B,IAAI,EAAE;QACJ,IAAI,EAAE,gBAAgB;QACtB,WAAW,EAAE,uEAAuE;KACrF;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qCAAqC,EAAE;QAC5E,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,wCAAwC,EAAE;QAC9E,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qDAAqD,EAAE;QAC9F,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,kDAAkD,EAAE,QAAQ,EAAE,IAAI,EAAE;QACzG,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,gCAAgC,EAAE;QACvE,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qDAAqD,EAAE;KAChG;IACD,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE;QAChB,MAAM,IAAI,GAAG,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,MAAM,IAAA,kCAAgB,EAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBACnE,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAA6B,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC9F,MAAM,MAAM,GAA4B,EAAE,CAAC;gBAC3C,IAAI,IAAI,CAAC,IAAI;oBAAE,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;gBAC1C,IAAI,IAAI,CAAC,GAAG;oBAAE,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC;gBACvC,IAAI,MAAM;oBAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;gBACtC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;oBACnC,SAAS;oBACT,EAAE,EAAE,eAAe;oBACnB,MAAM;oBACN,IAAI;iBACL,CAAC,CAAC;gBACH,IAAA,qBAAY,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAC/B,CAAC;oBAAS,CAAC;gBACT,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,QAAQ,GAAG,GAAG,YAAY,kBAAQ,CAAC,CAAC,CAAC,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;CACF,CAAC,CAAC;AAEH,KAAK,UAAU,WAAW,CAAC,GAAuB;IAChD,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACxC,IAAI,GAAG,KAAK,GAAG,EAAE,CAAC;QAChB,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,IAAI,KAAK,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,KAAK;YAAE,MAAM,CAAC,IAAI,CAAC,CAAW,CAAC,CAAC;QAC9D,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC"}

package/src/commands/generated/variables/get.js

@@ -5,6 +5,7 @@ const citty_1 = require("citty");
 const node_path_1 = require("node:path");
 const output_1 = require("../../../client/output");
 const rpc_client_1 = require("../../../client/rpc-client");
+const resolve_session_1 = require("../../../client/resolve-session");
 const jsonrpc_1 = require("../../../proto/jsonrpc");
 exports.default = (0, citty_1.defineCommand)({
     meta: {
@@ -24,7 +25,7 @@ exports.default = (0, citty_1.defineCommand)({
         try {
             const conn = await (0, rpc_client_1.connectClient)({ root, sessionId: args.session });
             try {
-                const sessionId = args.session ?? (await openSession(conn, root));
+                const sessionId = await (0, resolve_session_1.resolveSessionId)(conn, root, args.session);
                 const data = await readJsonArg(args.json);
                 const filter = args.filter ? JSON.parse(args.filter) : undefined;
                 const target = {};
@@ -52,10 +53,6 @@ exports.default = (0, citty_1.defineCommand)({
         }
     },
 });
-async function openSession(conn, root) {
-    const opened = await conn.call('session.open', { root });
-    return opened.sessionId;
-}
 async function readJsonArg(raw) {
     if (raw === undefined)
         return undefined;

package/src/commands/generated/variables/get.js.map

@@ -1 +1 @@
-{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../packages/cli/src/commands/generated/variables/get.ts"],"names":[],"mappings":";;AAAA,qEAAqE;AACrE,iCAAsC;AACtC,yCAAoC;AAEpC,mDAAgF;AAChF,2DAA2D;AAC3D,oDAAkD;AAElD,kBAAe,IAAA,qBAAa,EAAC;IAC3B,IAAI,EAAE;QACJ,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE,wDAAwD;KACtE;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qCAAqC,EAAE;QAC5E,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,wCAAwC,EAAE;QAC9E,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qDAAqD,EAAE;QAC9F,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,kDAAkD,EAAE;QACzF,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,gCAAgC,EAAE;QACvE,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qDAAqD,EAAE;KAChG;IACD,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE;QAChB,MAAM,IAAI,GAAG,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;gBAClE,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAA6B,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC9F,MAAM,MAAM,GAA4B,EAAE,CAAC;gBAC3C,IAAI,IAAI,CAAC,IAAI;oBAAE,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;gBAC1C,IAAI,IAAI,CAAC,GAAG;oBAAE,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC;gBACvC,IAAI,MAAM;oBAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;gBACtC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;oBACnC,SAAS;oBACT,EAAE,EAAE,cAAc;oBAClB,MAAM;oBACN,IAAI;iBACL,CAAC,CAAC;gBACH,IAAA,qBAAY,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAC/B,CAAC;oBAAS,CAAC;gBACT,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,QAAQ,GAAG,GAAG,YAAY,kBAAQ,CAAC,CAAC,CAAC,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;CACF,CAAC,CAAC;AAEH,KAAK,UAAU,WAAW,CACxB,IAAmE,EACnE,IAAY;IAEZ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAwB,cAAc,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAChF,OAAO,MAAM,CAAC,SAAS,CAAC;AAC1B,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,GAAuB;IAChD,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACxC,IAAI,GAAG,KAAK,GAAG,EAAE,CAAC;QAChB,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,IAAI,KAAK,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,KAAK;YAAE,MAAM,CAAC,IAAI,CAAC,CAAW,CAAC,CAAC;QAC9D,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC"}
+{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../packages/cli/src/commands/generated/variables/get.ts"],"names":[],"mappings":"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"}

package/src/commands/generated/variables/remove.js

@@ -5,6 +5,7 @@ const citty_1 = require("citty");
 const node_path_1 = require("node:path");
 const output_1 = require("../../../client/output");
 const rpc_client_1 = require("../../../client/rpc-client");
+const resolve_session_1 = require("../../../client/resolve-session");
 const jsonrpc_1 = require("../../../proto/jsonrpc");
 exports.default = (0, citty_1.defineCommand)({
     meta: {
@@ -24,7 +25,7 @@ exports.default = (0, citty_1.defineCommand)({
         try {
             const conn = await (0, rpc_client_1.connectClient)({ root, sessionId: args.session });
             try {
-                const sessionId = args.session ?? (await openSession(conn, root));
+                const sessionId = await (0, resolve_session_1.resolveSessionId)(conn, root, args.session);
                 const data = await readJsonArg(args.json);
                 const filter = args.filter ? JSON.parse(args.filter) : undefined;
                 const target = {};
@@ -52,10 +53,6 @@ exports.default = (0, citty_1.defineCommand)({
         }
     },
 });
-async function openSession(conn, root) {
-    const opened = await conn.call('session.open', { root });
-    return opened.sessionId;
-}
 async function readJsonArg(raw) {
     if (raw === undefined)
         return undefined;

package/src/commands/generated/variables/remove.js.map

@@ -1 +1 @@
-{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../../../../../packages/cli/src/commands/generated/variables/remove.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../../../../../packages/cli/src/commands/generated/variables/remove.ts"],"names":[],"mappings":"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"}

package/src/daemon/dispatcher.d.ts

@@ -16,6 +16,12 @@ export type Handler = (ctx: {
 export interface DispatcherOptions {
     manager: SessionManager;
     handlers?: Record<string, Handler>;
+    /**
+     * Called when a client invokes `daemon.shutdown`. The daemon entry
+     * wires this to its `shutdown()` handle so the process exits cleanly
+     * after the response is flushed.
+     */
+    onShutdownRequest?: () => void;
 }
 /**
  * Dispatch a single JSON-RPC request to its handler.
@@ -27,6 +33,7 @@ export interface DispatcherOptions {
 export declare class Dispatcher {
     private readonly handlers;
     private readonly manager;
+    private readonly onShutdownRequest;
     constructor(opts: DispatcherOptions);
     register(method: string, handler: Handler): void;
     hasMethod(method: string): boolean;

package/src/daemon/dispatcher.js

@@ -20,8 +20,10 @@ const snapshot_1 = require("./handlers/snapshot");
 class Dispatcher {
     handlers = new Map();
     manager;
+    onShutdownRequest;
     constructor(opts) {
         this.manager = opts.manager;
+        this.onShutdownRequest = opts.onShutdownRequest ?? null;
         this.register('session.open', sessionOpenHandler);
         this.register('session.close', sessionCloseHandler);
         this.register('session.list', sessionListHandler);
@@ -32,6 +34,14 @@ class Dispatcher {
         this.register('save', save_1.saveHandler);
         this.register('reload', reload_1.reloadHandler);
         this.register('op', op_1.opHandler);
+        this.register('daemon.shutdown', () => {
+            // Defer until after this response is written so the client sees a
+            // confirmation before the socket closes.
+            if (this.onShutdownRequest) {
+                setImmediate(() => this.onShutdownRequest?.());
+            }
+            return { ok: true };
+        });
         for (const [name, handler] of Object.entries(opts.handlers ?? {})) {
             this.register(name, handler);
         }

package/src/daemon/dispatcher.js.map

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

package/src/daemon/entry.d.ts

@@ -6,6 +6,13 @@ export interface DaemonArgs {
     root: string;
     sock: string;
     idleTimeoutMs?: number;
+    /**
+     * If `true`, a `daemon.shutdown` RPC causes the daemon to call
+     * `process.exit(0)` after the response is flushed. Defaults to
+     * `false` so in-process tests that drive the daemon directly do not
+     * kill the test runner.
+     */
+    exitOnShutdownRequest?: boolean;
 }
 /** Parse argv (positionals stripped) into the daemon's run args. */
 export declare function parseArgs(argv: string[]): DaemonArgs;

package/src/daemon/entry.js

@@ -5,6 +5,7 @@ exports.startDaemon = startDaemon;
 exports.main = main;
 exports.attachConnection = attachConnection;
 const tslib_1 = require("tslib");
+const node_fs_1 = require("node:fs");
 const node_net_1 = require("node:net");
 const node_path_1 = require("node:path");
 const package_json_1 = tslib_1.__importDefault(require("../../package.json"));
@@ -49,15 +50,20 @@ async function startDaemon(args) {
             void shutdown();
         },
     });
-    const dispatcher = new dispatcher_1.Dispatcher({ manager });
-    const server = (0, node_net_1.createServer)((socket) => attachConnection(socket, codec, dispatcher));
-    await new Promise((resolveListen, rejectListen) => {
-        server.once('error', rejectListen);
-        server.listen(args.sock, () => {
-            server.off('error', rejectListen);
-            resolveListen();
-        });
+    // Reference assigned later so `onShutdownRequest` can reach `shutdown`
+    // even though `shutdown` is declared further down.
+    const shutdownRef = { fn: null };
+    const dispatcher = new dispatcher_1.Dispatcher({
+        manager,
+        onShutdownRequest: () => {
+            void shutdownRef.fn?.().then(() => {
+                if (args.exitOnShutdownRequest)
+                    process.exit(0);
+            });
+        },
     });
+    const server = (0, node_net_1.createServer)((socket) => attachConnection(socket, codec, dispatcher));
+    await listenWithStaleSocketRecovery(server, args.sock);
     // Write the lockfile only after the server is listening so a client
     // that races our spawn never sees a path it cannot connect to.
     let lockfileWritten = false;
@@ -89,6 +95,7 @@ async function startDaemon(args) {
             (0, lockfile_1.unlink)(args.root);
         await closeServer(server);
     };
+    shutdownRef.fn = shutdown;
     return { server, manager, dispatcher, shutdown };
 }
 /**
@@ -97,7 +104,7 @@ async function startDaemon(args) {
  */
 async function main(argv = process.argv.slice(2)) {
     const args = parseArgs(argv);
-    const handle = await startDaemon(args);
+    const handle = await startDaemon({ ...args, exitOnShutdownRequest: true });
     for (const sig of ['SIGINT', 'SIGTERM']) {
         process.on(sig, () => {
             void handle.shutdown().then(() => process.exit(0));
@@ -142,6 +149,41 @@ function closeServer(server) {
         server.close(() => res());
     });
 }
+/**
+ * Bind `server` to `sock`. If the socket path already exists from a
+ * crashed previous daemon, unlink it and retry once. Windows named
+ * pipes do not need this dance.
+ */
+function listenWithStaleSocketRecovery(server, sock) {
+    return new Promise((resolveListen, rejectListen) => {
+        const onceErr = (err) => {
+            if (err.code === 'EADDRINUSE' && process.platform !== 'win32') {
+                try {
+                    (0, node_fs_1.unlinkSync)(sock);
+                }
+                catch (unlinkErr) {
+                    const code = unlinkErr.code;
+                    if (code !== 'ENOENT') {
+                        rejectListen(unlinkErr);
+                        return;
+                    }
+                }
+                server.once('error', rejectListen);
+                server.listen(sock, () => {
+                    server.off('error', rejectListen);
+                    resolveListen();
+                });
+                return;
+            }
+            rejectListen(err);
+        };
+        server.once('error', onceErr);
+        server.listen(sock, () => {
+            server.off('error', onceErr);
+            resolveListen();
+        });
+    });
+}
 // Allow the file to be invoked directly: `node daemon/entry.js --root ... --sock ...`
 if (require.main === module) {
     main().catch((err) => {

package/src/daemon/entry.js.map

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

package/src/daemon/handlers/generated/_runtime.js

@@ -5,30 +5,43 @@ exports.mintNodeRefs = mintNodeRefs;
 const error_codes_1 = require("../../../proto/error-codes");
 const jsonrpc_1 = require("../../../proto/jsonrpc");
 const core_1 = require("@mutates/core");
+/**
+ * Top-level finders accept `{ pattern }` directly because the result
+ * lives in the source file (classes, functions, etc.). Categories that
+ * live *inside* another declaration (methods inside classes, params
+ * inside functions, ...) need a two-step descent — see
+ * `COMPOSITE_RESOLVERS` below.
+ */
 const FINDERS = {
-    accessors: core_1.getAccessors,
     'all-decorators': core_1.getAllDecorators,
-    'class-accessors': core_1.getClassAccessors,
-    'class-methods': core_1.getClassMethods,
-    'class-properties': core_1.getClassProperties,
     classes: core_1.getClasses,
-    constructors: core_1.getConstructors,
-    decorators: core_1.getDecorators,
     enums: core_1.getEnums,
     exports: core_1.getExports,
     functions: core_1.getFunctions,
     imports: core_1.getImports,
     interfaces: core_1.getInterfaces,
-    methods: core_1.getMethods,
-    'named-imports': core_1.getNamedImports,
-    'object-accessors': core_1.getObjectAccessors,
-    'object-methods': core_1.getObjectMethods,
-    'object-properties': core_1.getObjectProperties,
-    params: core_1.getParams,
     'source-file': core_1.getSourceFile,
     'source-files': core_1.getSourceFiles,
     variables: core_1.getVariables,
 };
+/**
+ * Categories that need an enclosing scope before they can be enumerated.
+ * Each resolver receives the file glob plus the optional filter and
+ * returns the matched declarations. Without this, calling e.g.
+ * `getMethods({ pattern })` blows up because `getMethods` expects
+ * already-located class declarations, not a glob.
+ */
+const COMPOSITE_RESOLVERS = {
+    methods: (pattern) => (0, core_1.getMethods)((0, core_1.getClasses)({ pattern })),
+    accessors: (pattern) => (0, core_1.getAccessors)((0, core_1.getClasses)({ pattern })),
+    'class-accessors': (pattern) => (0, core_1.getClassAccessors)((0, core_1.getClasses)({ pattern })),
+    'class-methods': (pattern) => (0, core_1.getClassMethods)((0, core_1.getClasses)({ pattern })),
+    'class-properties': (pattern) => (0, core_1.getClassProperties)((0, core_1.getClasses)({ pattern })),
+    constructors: (pattern) => (0, core_1.getConstructors)((0, core_1.getClasses)({ pattern })),
+    decorators: (pattern) => (0, core_1.getDecorators)((0, core_1.getClasses)({ pattern })),
+    params: (pattern) => (0, core_1.getParams)((0, core_1.getFunctions)({ pattern })),
+    'named-imports': (pattern) => (0, core_1.getNamedImports)((0, core_1.getImports)({ pattern })),
+};
 /**
  * Resolve the target nodes for a generated handler. Either a single
  * `--ref` (preferred) or a `--file` glob plus an optional `--filter`
@@ -40,17 +53,25 @@ function resolveDeclarations(session, category, target) {
         return [node];
     }
     if (target?.file) {
-        const finder = FINDERS[category];
-        if (!finder) {
+        const nodes = resolveByPattern(category, target.file);
+        if (nodes === null) {
             throw new jsonrpc_1.RpcError(error_codes_1.ErrorCode.InvalidInput, `no finder registered for category "${category}" — pass --ref instead`, { category });
         }
-        const nodes = finder({ pattern: target.file });
         if (!target.filter)
             return nodes;
         return nodes.filter((n) => (0, core_1.matchQuery)(n.getStructure(), target.filter));
     }
     throw new jsonrpc_1.RpcError(error_codes_1.ErrorCode.InvalidInput, 'target requires either ref or file (with optional filter)');
 }
+function resolveByPattern(category, pattern) {
+    const composite = COMPOSITE_RESOLVERS[category];
+    if (composite)
+        return composite(pattern);
+    const finder = FINDERS[category];
+    if (!finder)
+        return null;
+    return finder({ pattern });
+}
 /**
  * Mint refs for every node returned by a `get*` op.
  *

package/src/daemon/handlers/generated/_runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"_runtime.js","sourceRoot":"","sources":["../../../../../../../packages/cli/src/daemon/handlers/generated/_runtime.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"_runtime.js","sourceRoot":"","sources":["../../../../../../../packages/cli/src/daemon/handlers/generated/_runtime.ts"],"names":[],"mappings":"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"}