@tacuchi/agent-workflow-cli 5.7.0 → 5.9.0
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/README.md +2 -2
- package/dist/application/checkpoint/markdown.js +1 -1
- package/dist/application/checkpoint/markdown.js.map +1 -1
- package/dist/application/checkpoint-write-service.js +1 -1
- package/dist/application/checkpoint-write-service.js.map +1 -1
- package/dist/application/dev-bootstrap-dsn-service.d.ts +9 -0
- package/dist/application/dev-bootstrap-dsn-service.d.ts.map +1 -1
- package/dist/application/dev-bootstrap-dsn-service.js +36 -1
- package/dist/application/dev-bootstrap-dsn-service.js.map +1 -1
- package/dist/application/dsn-reader-service.d.ts +1 -1
- package/dist/application/dsn-reader-service.d.ts.map +1 -1
- package/dist/application/dsn-reader-service.js +7 -1
- package/dist/application/dsn-reader-service.js.map +1 -1
- package/dist/application/history-table.js +1 -1
- package/dist/application/history-table.js.map +1 -1
- package/dist/application/hook-branch-check.d.ts +1 -1
- package/dist/application/mcp-connections-service.d.ts +37 -0
- package/dist/application/mcp-connections-service.d.ts.map +1 -0
- package/dist/application/mcp-connections-service.js +97 -0
- package/dist/application/mcp-connections-service.js.map +1 -0
- package/dist/application/mcp-dbhub-launcher.d.ts +1 -0
- package/dist/application/mcp-dbhub-launcher.d.ts.map +1 -1
- package/dist/application/mcp-dbhub-launcher.js +21 -7
- package/dist/application/mcp-dbhub-launcher.js.map +1 -1
- package/dist/application/mcp-doctor-service.d.ts +1 -0
- package/dist/application/mcp-doctor-service.d.ts.map +1 -1
- package/dist/application/mcp-doctor-service.js +6 -6
- package/dist/application/mcp-doctor-service.js.map +1 -1
- package/dist/application/mcp-host-writer.d.ts +1 -0
- package/dist/application/mcp-host-writer.d.ts.map +1 -1
- package/dist/application/mcp-host-writer.js +53 -0
- package/dist/application/mcp-host-writer.js.map +1 -1
- package/dist/application/mcp-remove-service.d.ts +31 -0
- package/dist/application/mcp-remove-service.d.ts.map +1 -0
- package/dist/application/mcp-remove-service.js +69 -0
- package/dist/application/mcp-remove-service.js.map +1 -0
- package/dist/application/mcp-setup-service.d.ts +1 -0
- package/dist/application/mcp-setup-service.d.ts.map +1 -1
- package/dist/application/mcp-setup-service.js +4 -4
- package/dist/application/mcp-setup-service.js.map +1 -1
- package/dist/application/multiroot-service.js +2 -2
- package/dist/application/multiroot-service.js.map +1 -1
- package/dist/application/paths-service.d.ts +1 -0
- package/dist/application/paths-service.d.ts.map +1 -1
- package/dist/application/paths-service.js +3 -0
- package/dist/application/paths-service.js.map +1 -1
- package/dist/application/phase-next-service.js +1 -1
- package/dist/application/phase-next-service.js.map +1 -1
- package/dist/application/plugin-doctor/manifests.d.ts +1 -1
- package/dist/application/plugin-doctor/manifests.d.ts.map +1 -1
- package/dist/application/plugin-doctor/manifests.js +9 -9
- package/dist/application/plugin-doctor/manifests.js.map +1 -1
- package/dist/application/release-data/artifacts.js +3 -3
- package/dist/application/release-data/artifacts.js.map +1 -1
- package/dist/application/release-data/sessions.js +3 -3
- package/dist/application/release-data/sessions.js.map +1 -1
- package/dist/application/self/bootstrap.js +4 -4
- package/dist/application/self/bootstrap.js.map +1 -1
- package/dist/application/self/mcp-config.d.ts +59 -0
- package/dist/application/self/mcp-config.d.ts.map +1 -0
- package/dist/application/self/mcp-config.js +481 -0
- package/dist/application/self/mcp-config.js.map +1 -0
- package/dist/application/session-close-service.d.ts.map +1 -1
- package/dist/application/session-close-service.js +34 -24
- package/dist/application/session-close-service.js.map +1 -1
- package/dist/application/session-create-service.js +8 -8
- package/dist/application/session-create-service.js.map +1 -1
- package/dist/application/sessions-service.d.ts.map +1 -1
- package/dist/application/sessions-service.js +2 -2
- package/dist/application/sessions-service.js.map +1 -1
- package/dist/application/upgrade-hub-mode-service.js +1 -1
- package/dist/application/upgrade-hub-mode-service.js.map +1 -1
- package/dist/application/visibility-doctor-service.js +1 -1
- package/dist/application/visibility-doctor-service.js.map +1 -1
- package/dist/application/workspace-mode-service.js +1 -1
- package/dist/application/workspace-mode-service.js.map +1 -1
- package/dist/cli/commands/hub-init.js +1 -1
- package/dist/cli/commands/hub-init.js.map +1 -1
- package/dist/cli/commands/mcp.d.ts.map +1 -1
- package/dist/cli/commands/mcp.js +94 -8
- package/dist/cli/commands/mcp.js.map +1 -1
- package/dist/cli/commands/project-md-upsert.js +1 -1
- package/dist/cli/commands/project-md-upsert.js.map +1 -1
- package/dist/cli/commands/self.d.ts.map +1 -1
- package/dist/cli/commands/self.js +6 -2
- package/dist/cli/commands/self.js.map +1 -1
- package/dist/cli/commands/session-close.js +1 -1
- package/dist/cli/commands/session-close.js.map +1 -1
- package/dist/cli/commands/session-create.js +1 -1
- package/dist/cli/commands/session-create.js.map +1 -1
- package/dist/cli/commands/session-resume.js +1 -1
- package/dist/cli/commands/session-resume.js.map +1 -1
- package/dist/cli/commands/sources.js +1 -1
- package/dist/cli/commands/sources.js.map +1 -1
- package/dist/cli/interactive-menu.d.ts +1 -1
- package/dist/cli/interactive-menu.d.ts.map +1 -1
- package/dist/cli/interactive-menu.js +1 -0
- package/dist/cli/interactive-menu.js.map +1 -1
- package/dist/cli/main.js +12 -4
- package/dist/cli/main.js.map +1 -1
- package/dist/domain/mcp-entry.d.ts +22 -4
- package/dist/domain/mcp-entry.d.ts.map +1 -1
- package/dist/domain/mcp-entry.js +55 -8
- package/dist/domain/mcp-entry.js.map +1 -1
- package/dist/runtime/types.d.ts +1 -1
- package/dist/runtime/types.d.ts.map +1 -1
- package/package.json +2 -2
- package/skills/agent-workflow/MANUAL-FUNCIONAL.md +4 -4
- package/skills/agent-workflow/MANUAL-TECNICO.md +4 -4
- package/skills/agent-workflow/SKILL.md +3 -3
- package/skills/agent-workflow/docs/TEST-PLAN.md +16 -16
- package/skills/agent-workflow/references/dev-only.md +1 -1
- package/skills/agent-workflow/references/doctor.md +1 -1
- package/skills/agent-workflow/references/history.md +1 -1
- package/skills/agent-workflow/references/hooks.md +2 -2
- package/skills/agent-workflow/references/mcp.md +8 -5
- package/skills/agent-workflow/references/orchestration.md +2 -2
- package/skills/agent-workflow/references/self.md +1 -1
- package/skills/agent-workflow/references/session-mgmt.md +1 -1
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import type { ParsedArgs } from "../../cli/parser.js";
|
|
2
|
+
import type { CliContext } from "../../cli/types.js";
|
|
3
|
+
import { type McpInstance } from "../../domain/mcp-entry.js";
|
|
4
|
+
import type { CommandResult } from "../../domain/types.js";
|
|
5
|
+
import { type McpDoctorResult } from "../mcp-doctor-service.js";
|
|
6
|
+
import { type McpRemoveResult } from "../mcp-remove-service.js";
|
|
7
|
+
import { type McpSetupResult } from "../mcp-setup-service.js";
|
|
8
|
+
type SelfMcpAction = "list" | "use-env" | "create-env" | "install-claude" | "install-codex" | "doctor" | "remove" | "cancel";
|
|
9
|
+
type InstallStatus = "si" | "no" | "drift";
|
|
10
|
+
interface PromptChoice<T extends string> {
|
|
11
|
+
name: string;
|
|
12
|
+
value: T;
|
|
13
|
+
description?: string;
|
|
14
|
+
}
|
|
15
|
+
export interface SelfMcpPrompts {
|
|
16
|
+
select<T extends string>(options: {
|
|
17
|
+
message: string;
|
|
18
|
+
choices: PromptChoice<T>[];
|
|
19
|
+
default?: T;
|
|
20
|
+
}): Promise<T>;
|
|
21
|
+
input(options: {
|
|
22
|
+
message: string;
|
|
23
|
+
default?: string;
|
|
24
|
+
validate?: (value: string) => boolean | string;
|
|
25
|
+
}): Promise<string>;
|
|
26
|
+
}
|
|
27
|
+
export interface SelfMcpConnectionView {
|
|
28
|
+
nombre: McpInstance;
|
|
29
|
+
server_name: string;
|
|
30
|
+
dsn_var: string;
|
|
31
|
+
dsn_visible: boolean;
|
|
32
|
+
instalado: {
|
|
33
|
+
claude_code: InstallStatus;
|
|
34
|
+
codex: InstallStatus;
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
export interface SelfMcpConfigData {
|
|
38
|
+
action: SelfMcpAction;
|
|
39
|
+
connection: SelfMcpConnectionView | null;
|
|
40
|
+
connections?: SelfMcpConnectionView[];
|
|
41
|
+
table?: string;
|
|
42
|
+
registry?: {
|
|
43
|
+
path: string;
|
|
44
|
+
changed: boolean;
|
|
45
|
+
};
|
|
46
|
+
setup?: McpSetupResult;
|
|
47
|
+
remove?: McpRemoveResult;
|
|
48
|
+
doctor?: McpDoctorResult;
|
|
49
|
+
env_help?: {
|
|
50
|
+
platform: string;
|
|
51
|
+
variable: string;
|
|
52
|
+
commands: string[];
|
|
53
|
+
next_step: string;
|
|
54
|
+
};
|
|
55
|
+
summary: string;
|
|
56
|
+
}
|
|
57
|
+
export declare function selfMcpConfig(args: ParsedArgs, ctx: CliContext, prompts?: SelfMcpPrompts): Promise<CommandResult<SelfMcpConfigData>>;
|
|
58
|
+
export {};
|
|
59
|
+
//# sourceMappingURL=mcp-config.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mcp-config.d.ts","sourceRoot":"","sources":["../../../src/application/self/mcp-config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAEL,KAAK,WAAW,EAMjB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAQ3D,OAAO,EAAE,KAAK,eAAe,EAAgB,MAAM,0BAA0B,CAAC;AAE9E,OAAO,EAAE,KAAK,eAAe,EAAgB,MAAM,0BAA0B,CAAC;AAC9E,OAAO,EAAE,KAAK,cAAc,EAAe,MAAM,yBAAyB,CAAC;AAE3E,KAAK,aAAa,GACd,MAAM,GACN,SAAS,GACT,YAAY,GACZ,gBAAgB,GAChB,eAAe,GACf,QAAQ,GACR,QAAQ,GACR,QAAQ,CAAC;AAEb,KAAK,aAAa,GAAG,IAAI,GAAG,IAAI,GAAG,OAAO,CAAC;AAG3C,UAAU,YAAY,CAAC,CAAC,SAAS,MAAM;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,CAAC,CAAC;IACT,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,OAAO,EAAE;QAChC,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3B,OAAO,CAAC,EAAE,CAAC,CAAC;KACb,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACf,KAAK,CAAC,OAAO,EAAE;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,GAAG,MAAM,CAAC;KAChD,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CACrB;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,WAAW,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE;QACT,WAAW,EAAE,aAAa,CAAC;QAC3B,KAAK,EAAE,aAAa,CAAC;KACtB,CAAC;CACH;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,aAAa,CAAC;IACtB,UAAU,EAAE,qBAAqB,GAAG,IAAI,CAAC;IACzC,WAAW,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;IAC9C,KAAK,CAAC,EAAE,cAAc,CAAC;IACvB,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,QAAQ,CAAC,EAAE;QACT,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,OAAO,EAAE,MAAM,CAAC;CACjB;AAOD,wBAAsB,aAAa,CACjC,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,UAAU,EACf,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,CA0B3C"}
|
|
@@ -0,0 +1,481 @@
|
|
|
1
|
+
import { resolve } from "node:path";
|
|
2
|
+
import { buildMcpEntry, mcpEntryNameFor, normalizeDsnVarName, validateDsnVarName, validateMcpInstance, } from "../../domain/mcp-entry.js";
|
|
3
|
+
import { readBootstrapDsn } from "../dsn-reader-service.js";
|
|
4
|
+
import { deleteMcpConnection, readMcpConnections, upsertMcpConnection, } from "../mcp-connections-service.js";
|
|
5
|
+
import { runMcpDoctor } from "../mcp-doctor-service.js";
|
|
6
|
+
import { readMcpEntry } from "../mcp-host-reader.js";
|
|
7
|
+
import { runMcpRemove } from "../mcp-remove-service.js";
|
|
8
|
+
import { runMcpSetup } from "../mcp-setup-service.js";
|
|
9
|
+
export async function selfMcpConfig(args, ctx, prompts) {
|
|
10
|
+
const prompt = prompts ?? (await loadPrompts());
|
|
11
|
+
const resolved = await resolveAction(args, prompt);
|
|
12
|
+
switch (resolved.action) {
|
|
13
|
+
case "list":
|
|
14
|
+
return resolved.fromArgs ? listConnections(ctx) : listConnectionsMenu(args, ctx, prompt);
|
|
15
|
+
case "use-env":
|
|
16
|
+
return useExistingDsnVar(args, ctx, prompt);
|
|
17
|
+
case "create-env":
|
|
18
|
+
return createDsnEnvHelp(args, prompt);
|
|
19
|
+
case "install-claude":
|
|
20
|
+
return runConnectionAction(args, ctx, prompt, resolved.action);
|
|
21
|
+
case "install-codex":
|
|
22
|
+
return runConnectionAction(args, ctx, prompt, resolved.action);
|
|
23
|
+
case "doctor":
|
|
24
|
+
return runConnectionAction(args, ctx, prompt, resolved.action);
|
|
25
|
+
case "remove":
|
|
26
|
+
return runConnectionAction(args, ctx, prompt, resolved.action);
|
|
27
|
+
case "cancel":
|
|
28
|
+
return {
|
|
29
|
+
ok: true,
|
|
30
|
+
data: { action: "cancel", connection: null, summary: "Operación cancelada." },
|
|
31
|
+
exitCode: 0,
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
function listConnections(ctx) {
|
|
36
|
+
const connections = connectionViews(ctx);
|
|
37
|
+
return {
|
|
38
|
+
ok: true,
|
|
39
|
+
data: {
|
|
40
|
+
action: "list",
|
|
41
|
+
connection: null,
|
|
42
|
+
connections,
|
|
43
|
+
table: formatConnectionsTable(connections),
|
|
44
|
+
summary: connections.length > 0
|
|
45
|
+
? `${connections.length} conexión(es) MCP registradas.`
|
|
46
|
+
: "No hay conexiones MCP registradas.",
|
|
47
|
+
},
|
|
48
|
+
exitCode: 0,
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
async function listConnectionsMenu(args, ctx, prompts) {
|
|
52
|
+
const connections = connectionViews(ctx);
|
|
53
|
+
if (connections.length === 0) {
|
|
54
|
+
return {
|
|
55
|
+
ok: true,
|
|
56
|
+
data: {
|
|
57
|
+
action: "list",
|
|
58
|
+
connection: null,
|
|
59
|
+
connections,
|
|
60
|
+
table: formatConnectionsTable(connections),
|
|
61
|
+
summary: "No hay conexiones MCP registradas. Primero usa una DSN env var existente.",
|
|
62
|
+
},
|
|
63
|
+
exitCode: 0,
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
const action = await prompts.select({
|
|
67
|
+
message: formatConnectionsTable(connections),
|
|
68
|
+
default: "install-claude",
|
|
69
|
+
choices: [
|
|
70
|
+
{ name: "Instalar/Actualizar en Claude Code", value: "install-claude" },
|
|
71
|
+
{ name: "Instalar/Actualizar en Codex", value: "install-codex" },
|
|
72
|
+
{ name: "Diagnosticar", value: "doctor" },
|
|
73
|
+
{ name: "Eliminar", value: "remove" },
|
|
74
|
+
{ name: "Cancelar", value: "cancel" },
|
|
75
|
+
],
|
|
76
|
+
});
|
|
77
|
+
if (action === "cancel") {
|
|
78
|
+
return {
|
|
79
|
+
ok: true,
|
|
80
|
+
data: {
|
|
81
|
+
action,
|
|
82
|
+
connection: null,
|
|
83
|
+
connections,
|
|
84
|
+
table: formatConnectionsTable(connections),
|
|
85
|
+
summary: "Operación cancelada.",
|
|
86
|
+
},
|
|
87
|
+
exitCode: 0,
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
return runConnectionAction(args, ctx, prompts, action);
|
|
91
|
+
}
|
|
92
|
+
async function useExistingDsnVar(args, ctx, prompts) {
|
|
93
|
+
const name = await resolveConnectionName(args, prompts);
|
|
94
|
+
const dsnVar = await resolveDsnVar(args, prompts, name);
|
|
95
|
+
if (!isDsnVisible(ctx, dsnVar)) {
|
|
96
|
+
return {
|
|
97
|
+
ok: false,
|
|
98
|
+
error: {
|
|
99
|
+
code: "DSN_VAR_NOT_VISIBLE",
|
|
100
|
+
message: `${dsnVar} no está visible en el entorno actual ni en ${ctx.paths.userDsnFile()}.`,
|
|
101
|
+
},
|
|
102
|
+
data: {
|
|
103
|
+
action: "use-env",
|
|
104
|
+
connection: null,
|
|
105
|
+
env_help: buildEnvHelp(dsnVar, name),
|
|
106
|
+
summary: `Exporta ${dsnVar} y vuelve a registrar la conexión.`,
|
|
107
|
+
},
|
|
108
|
+
exitCode: 1,
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
const write = upsertMcpConnection(ctx.paths, { name, dsnVar });
|
|
112
|
+
const connection = connectionView(ctx, {
|
|
113
|
+
name: write.connection.name,
|
|
114
|
+
dsnVar: write.connection.dsnVar,
|
|
115
|
+
dsnPresent: true,
|
|
116
|
+
});
|
|
117
|
+
return {
|
|
118
|
+
ok: true,
|
|
119
|
+
data: {
|
|
120
|
+
action: "use-env",
|
|
121
|
+
connection,
|
|
122
|
+
connections: connectionViews(ctx),
|
|
123
|
+
table: formatConnectionsTable(connectionViews(ctx)),
|
|
124
|
+
registry: { path: write.path, changed: true },
|
|
125
|
+
summary: `Conexión '${connection.nombre}' registrada con ${connection.dsn_var}.`,
|
|
126
|
+
},
|
|
127
|
+
exitCode: 0,
|
|
128
|
+
};
|
|
129
|
+
}
|
|
130
|
+
async function createDsnEnvHelp(args, prompts) {
|
|
131
|
+
const name = await resolveConnectionName(args, prompts);
|
|
132
|
+
const dsnVar = await resolveDsnVar(args, prompts, name);
|
|
133
|
+
return {
|
|
134
|
+
ok: true,
|
|
135
|
+
data: {
|
|
136
|
+
action: "create-env",
|
|
137
|
+
connection: null,
|
|
138
|
+
env_help: buildEnvHelp(dsnVar, name),
|
|
139
|
+
summary: `Comandos sugeridos para crear ${dsnVar}. No se instaló ningún host.`,
|
|
140
|
+
},
|
|
141
|
+
exitCode: 0,
|
|
142
|
+
};
|
|
143
|
+
}
|
|
144
|
+
async function runConnectionAction(args, ctx, prompts, action) {
|
|
145
|
+
const connection = await resolveRegisteredConnection(args, ctx, prompts);
|
|
146
|
+
if (connection === null) {
|
|
147
|
+
return {
|
|
148
|
+
ok: false,
|
|
149
|
+
error: {
|
|
150
|
+
code: "NO_MCP_CONNECTIONS",
|
|
151
|
+
message: "No hay conexiones MCP registradas. Usa primero 'self mcp use-env'.",
|
|
152
|
+
},
|
|
153
|
+
data: { action, connection: null, summary: "No hay conexiones MCP registradas." },
|
|
154
|
+
exitCode: 1,
|
|
155
|
+
};
|
|
156
|
+
}
|
|
157
|
+
switch (action) {
|
|
158
|
+
case "install-claude":
|
|
159
|
+
return installConnection(args, ctx, connection, "claude");
|
|
160
|
+
case "install-codex":
|
|
161
|
+
return installConnection(args, ctx, connection, "codex");
|
|
162
|
+
case "doctor":
|
|
163
|
+
return doctorConnection(ctx, connection);
|
|
164
|
+
case "remove":
|
|
165
|
+
return removeConnection(args, ctx, connection);
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
function installConnection(args, ctx, connection, host) {
|
|
169
|
+
const setup = runMcpSetup(ctx.env, {
|
|
170
|
+
hosts: [host],
|
|
171
|
+
instances: [connection.name],
|
|
172
|
+
scope: "workspace",
|
|
173
|
+
dsnVars: { [connection.name]: connection.dsnVar },
|
|
174
|
+
dryRun: args.flags.has("--dry-run"),
|
|
175
|
+
});
|
|
176
|
+
if ("ok" in setup)
|
|
177
|
+
return refusal(hostAction(host), connectionView(ctx, connection), setup.hint);
|
|
178
|
+
const doctor = runDoctor(ctx, connection, [host]);
|
|
179
|
+
const hasErrors = setup.errors.length > 0;
|
|
180
|
+
return {
|
|
181
|
+
ok: !hasErrors,
|
|
182
|
+
data: {
|
|
183
|
+
action: hostAction(host),
|
|
184
|
+
connection: connectionView(ctx, connection),
|
|
185
|
+
connections: connectionViews(ctx),
|
|
186
|
+
table: formatConnectionsTable(connectionViews(ctx)),
|
|
187
|
+
setup,
|
|
188
|
+
doctor,
|
|
189
|
+
summary: `Conexión '${connection.name}' instalada/actualizada en ${hostLabel(host)}.`,
|
|
190
|
+
},
|
|
191
|
+
...(hasErrors
|
|
192
|
+
? {
|
|
193
|
+
error: {
|
|
194
|
+
code: "MCP_SETUP_PARTIAL",
|
|
195
|
+
message: `${setup.errors.length} error(es) durante setup; ver data.setup.errors`,
|
|
196
|
+
},
|
|
197
|
+
}
|
|
198
|
+
: {}),
|
|
199
|
+
exitCode: hasErrors ? 1 : 0,
|
|
200
|
+
};
|
|
201
|
+
}
|
|
202
|
+
function doctorConnection(ctx, connection) {
|
|
203
|
+
const doctor = runDoctor(ctx, connection, ["claude", "codex"]);
|
|
204
|
+
const allOk = doctor.summary.ok === doctor.reports.length;
|
|
205
|
+
return {
|
|
206
|
+
ok: allOk,
|
|
207
|
+
data: {
|
|
208
|
+
action: "doctor",
|
|
209
|
+
connection: connectionView(ctx, connection),
|
|
210
|
+
doctor,
|
|
211
|
+
summary: `Diagnóstico MCP ejecutado para '${connection.name}'.`,
|
|
212
|
+
},
|
|
213
|
+
...(allOk
|
|
214
|
+
? {}
|
|
215
|
+
: {
|
|
216
|
+
error: {
|
|
217
|
+
code: "MCP_DOCTOR_DRIFT",
|
|
218
|
+
message: `${doctor.reports.length - doctor.summary.ok}/${doctor.reports.length} entradas con drift`,
|
|
219
|
+
},
|
|
220
|
+
}),
|
|
221
|
+
exitCode: allOk ? 0 : 1,
|
|
222
|
+
};
|
|
223
|
+
}
|
|
224
|
+
function removeConnection(args, ctx, connection) {
|
|
225
|
+
const dryRun = args.flags.has("--dry-run");
|
|
226
|
+
const remove = runMcpRemove(ctx.env, {
|
|
227
|
+
hosts: ["claude", "codex"],
|
|
228
|
+
instances: [connection.name],
|
|
229
|
+
scope: "workspace",
|
|
230
|
+
dryRun,
|
|
231
|
+
});
|
|
232
|
+
if ("ok" in remove)
|
|
233
|
+
return refusal("remove", connectionView(ctx, connection), remove.hint);
|
|
234
|
+
const hasErrors = remove.errors.length > 0;
|
|
235
|
+
const deleted = !dryRun && !hasErrors ? deleteMcpConnection(ctx.paths, connection) : null;
|
|
236
|
+
return {
|
|
237
|
+
ok: !hasErrors,
|
|
238
|
+
data: {
|
|
239
|
+
action: "remove",
|
|
240
|
+
connection: connectionView(ctx, connection),
|
|
241
|
+
connections: connectionViews(ctx),
|
|
242
|
+
table: formatConnectionsTable(connectionViews(ctx)),
|
|
243
|
+
remove,
|
|
244
|
+
...(deleted ? { registry: { path: deleted.path, changed: deleted.removed } } : {}),
|
|
245
|
+
summary: dryRun
|
|
246
|
+
? `Previsualización de eliminación para '${connection.name}'.`
|
|
247
|
+
: `Conexión '${connection.name}' eliminada de Claude Code, Codex y del registro local.`,
|
|
248
|
+
},
|
|
249
|
+
...(hasErrors
|
|
250
|
+
? {
|
|
251
|
+
error: {
|
|
252
|
+
code: "MCP_REMOVE_PARTIAL",
|
|
253
|
+
message: `${remove.errors.length} error(es) durante remove; ver data.remove.errors`,
|
|
254
|
+
},
|
|
255
|
+
}
|
|
256
|
+
: {}),
|
|
257
|
+
exitCode: hasErrors ? 1 : 0,
|
|
258
|
+
};
|
|
259
|
+
}
|
|
260
|
+
function runDoctor(ctx, connection, hosts) {
|
|
261
|
+
return runMcpDoctor(ctx.env, ctx.paths, {
|
|
262
|
+
hosts,
|
|
263
|
+
instances: [connection.name],
|
|
264
|
+
scope: "workspace",
|
|
265
|
+
dsnVars: { [connection.name]: connection.dsnVar },
|
|
266
|
+
});
|
|
267
|
+
}
|
|
268
|
+
function connectionViews(ctx) {
|
|
269
|
+
return readMcpConnections(ctx.paths, ctx.env).map((connection) => connectionView(ctx, connection));
|
|
270
|
+
}
|
|
271
|
+
function connectionView(ctx, connection) {
|
|
272
|
+
return {
|
|
273
|
+
nombre: connection.name,
|
|
274
|
+
server_name: mcpEntryNameFor(connection.name),
|
|
275
|
+
dsn_var: connection.dsnVar,
|
|
276
|
+
dsn_visible: isDsnVisible(ctx, connection.dsnVar),
|
|
277
|
+
instalado: {
|
|
278
|
+
claude_code: installStatus(ctx, connection, "claude"),
|
|
279
|
+
codex: installStatus(ctx, connection, "codex"),
|
|
280
|
+
},
|
|
281
|
+
};
|
|
282
|
+
}
|
|
283
|
+
function installStatus(ctx, connection, host) {
|
|
284
|
+
const entry = buildMcpEntry(connection.name, connection.dsnVar);
|
|
285
|
+
const snapshot = readMcpEntry(host, resolve(ctx.env.cwd()), entry.name);
|
|
286
|
+
if (!snapshot.exists)
|
|
287
|
+
return "no";
|
|
288
|
+
if (snapshot.command !== entry.command)
|
|
289
|
+
return "drift";
|
|
290
|
+
if (!arraysEqual(snapshot.args ?? [], entry.args))
|
|
291
|
+
return "drift";
|
|
292
|
+
if (!recordsEqual(snapshot.env ?? {}, entry.env))
|
|
293
|
+
return "drift";
|
|
294
|
+
return "si";
|
|
295
|
+
}
|
|
296
|
+
function isDsnVisible(ctx, dsnVar) {
|
|
297
|
+
if (ctx.env.get(dsnVar))
|
|
298
|
+
return true;
|
|
299
|
+
const dsn = readBootstrapDsn(ctx.paths);
|
|
300
|
+
return Boolean(dsn.values[dsnVar]);
|
|
301
|
+
}
|
|
302
|
+
function formatConnectionsTable(connections) {
|
|
303
|
+
const header = "| nombre | DSN var (nombre) | Instalado en Claude Code | Instalado en Codex |";
|
|
304
|
+
const separator = "|---|---|---|---|";
|
|
305
|
+
if (connections.length === 0)
|
|
306
|
+
return `${header}\n${separator}`;
|
|
307
|
+
const rows = connections.map((item) => `| ${item.nombre} | ${item.dsn_var} | ${item.instalado.claude_code} | ${item.instalado.codex} |`);
|
|
308
|
+
return [header, separator, ...rows].join("\n");
|
|
309
|
+
}
|
|
310
|
+
async function resolveRegisteredConnection(args, ctx, prompts) {
|
|
311
|
+
const connections = readMcpConnections(ctx.paths, ctx.env);
|
|
312
|
+
if (connections.length === 0)
|
|
313
|
+
return null;
|
|
314
|
+
const raw = args.values.get("name") ?? args.values.get("instance");
|
|
315
|
+
if (raw !== undefined) {
|
|
316
|
+
const validation = validateMcpInstance(raw);
|
|
317
|
+
if (!validation.ok)
|
|
318
|
+
throw new Error(validation.error);
|
|
319
|
+
const found = connections.find((item) => item.name === validation.value);
|
|
320
|
+
if (found === undefined) {
|
|
321
|
+
throw new Error(`conexión MCP no registrada: '${validation.value}'`);
|
|
322
|
+
}
|
|
323
|
+
return found;
|
|
324
|
+
}
|
|
325
|
+
const selected = await prompts.select({
|
|
326
|
+
message: "Conexión",
|
|
327
|
+
default: connections[0]?.name ?? "cert",
|
|
328
|
+
choices: connections.map((item) => ({
|
|
329
|
+
name: `${item.name} (${item.dsnVar})`,
|
|
330
|
+
value: item.name,
|
|
331
|
+
})),
|
|
332
|
+
});
|
|
333
|
+
return connections.find((item) => item.name === selected) ?? null;
|
|
334
|
+
}
|
|
335
|
+
async function resolveConnectionName(args, prompts) {
|
|
336
|
+
const raw = args.values.get("name") ?? args.values.get("instance");
|
|
337
|
+
if (raw !== undefined) {
|
|
338
|
+
const validation = validateMcpInstance(raw);
|
|
339
|
+
if (!validation.ok)
|
|
340
|
+
throw new Error(validation.error);
|
|
341
|
+
return validation.value;
|
|
342
|
+
}
|
|
343
|
+
const value = await prompts.input({
|
|
344
|
+
message: "Nombre de conexión",
|
|
345
|
+
default: "cert",
|
|
346
|
+
validate: (input) => {
|
|
347
|
+
const validation = validateMcpInstance(input);
|
|
348
|
+
return validation.ok ? true : validation.error;
|
|
349
|
+
},
|
|
350
|
+
});
|
|
351
|
+
const validation = validateMcpInstance(value);
|
|
352
|
+
if (!validation.ok)
|
|
353
|
+
throw new Error(validation.error);
|
|
354
|
+
return validation.value;
|
|
355
|
+
}
|
|
356
|
+
async function resolveDsnVar(args, prompts, name) {
|
|
357
|
+
const raw = args.values.get("dsn-var") ?? args.values.get("var");
|
|
358
|
+
if (raw !== undefined) {
|
|
359
|
+
const validation = validateDsnVarName(raw);
|
|
360
|
+
if (!validation.ok)
|
|
361
|
+
throw new Error(validation.error);
|
|
362
|
+
return validation.value;
|
|
363
|
+
}
|
|
364
|
+
const value = await prompts.input({
|
|
365
|
+
message: "Nombre de variable DSN",
|
|
366
|
+
default: defaultDsnVar(name),
|
|
367
|
+
validate: (input) => {
|
|
368
|
+
const validation = validateDsnVarName(input);
|
|
369
|
+
return validation.ok ? true : validation.error;
|
|
370
|
+
},
|
|
371
|
+
});
|
|
372
|
+
const validation = validateDsnVarName(value);
|
|
373
|
+
if (!validation.ok)
|
|
374
|
+
throw new Error(validation.error);
|
|
375
|
+
return validation.value;
|
|
376
|
+
}
|
|
377
|
+
function defaultDsnVar(name) {
|
|
378
|
+
const normalized = name.toUpperCase().replace(/-/g, "_");
|
|
379
|
+
if (normalized === "CERT")
|
|
380
|
+
return "DB_CERT_DSN";
|
|
381
|
+
if (normalized === "PROD")
|
|
382
|
+
return "DB_PROD_DSN";
|
|
383
|
+
return `DB_${normalized}_DSN`;
|
|
384
|
+
}
|
|
385
|
+
function buildEnvHelp(dsnVar, name) {
|
|
386
|
+
const variable = normalizeDsnVarName(dsnVar);
|
|
387
|
+
const platform = process.platform === "win32" ? "windows" : process.platform;
|
|
388
|
+
const commands = process.platform === "win32"
|
|
389
|
+
? [
|
|
390
|
+
`$env:${variable} = "<DSN>"`,
|
|
391
|
+
`[Environment]::SetEnvironmentVariable("${variable}", "<DSN>", "User")`,
|
|
392
|
+
]
|
|
393
|
+
: [
|
|
394
|
+
`export ${variable}='<DSN>'`,
|
|
395
|
+
`printf '%s\\n' "export ${variable}='<DSN>'" >> ${shellStartupFile()}`,
|
|
396
|
+
];
|
|
397
|
+
return {
|
|
398
|
+
platform,
|
|
399
|
+
variable,
|
|
400
|
+
commands,
|
|
401
|
+
next_step: `agent-workflow self mcp use-env --name ${name} --dsn-var ${variable}`,
|
|
402
|
+
};
|
|
403
|
+
}
|
|
404
|
+
function shellStartupFile() {
|
|
405
|
+
const shell = process.env.SHELL ?? "";
|
|
406
|
+
if (shell.endsWith("/zsh"))
|
|
407
|
+
return "~/.zshenv";
|
|
408
|
+
if (shell.endsWith("/bash"))
|
|
409
|
+
return "~/.bashrc";
|
|
410
|
+
return "~/.profile";
|
|
411
|
+
}
|
|
412
|
+
async function loadPrompts() {
|
|
413
|
+
const prompts = await import("@inquirer/prompts");
|
|
414
|
+
return {
|
|
415
|
+
select: prompts.select,
|
|
416
|
+
input: prompts.input,
|
|
417
|
+
};
|
|
418
|
+
}
|
|
419
|
+
async function resolveAction(args, prompts) {
|
|
420
|
+
const raw = args.values.get("action") ?? args.rest[1];
|
|
421
|
+
if (isAction(raw))
|
|
422
|
+
return { action: raw, fromArgs: true };
|
|
423
|
+
return {
|
|
424
|
+
action: await prompts.select({
|
|
425
|
+
message: "Configurar MCP database (dbhub)",
|
|
426
|
+
default: "list",
|
|
427
|
+
choices: [
|
|
428
|
+
{ name: "Listar conexiones existentes", value: "list" },
|
|
429
|
+
{ name: "Utilizar DSN env var existente", value: "use-env" },
|
|
430
|
+
{ name: "Crear DSN env var", value: "create-env" },
|
|
431
|
+
{ name: "Cancelar", value: "cancel" },
|
|
432
|
+
],
|
|
433
|
+
}),
|
|
434
|
+
fromArgs: false,
|
|
435
|
+
};
|
|
436
|
+
}
|
|
437
|
+
function isAction(value) {
|
|
438
|
+
return (value === "list" ||
|
|
439
|
+
value === "use-env" ||
|
|
440
|
+
value === "create-env" ||
|
|
441
|
+
value === "install-claude" ||
|
|
442
|
+
value === "install-codex" ||
|
|
443
|
+
value === "doctor" ||
|
|
444
|
+
value === "remove" ||
|
|
445
|
+
value === "cancel");
|
|
446
|
+
}
|
|
447
|
+
function hostAction(host) {
|
|
448
|
+
return host === "claude" ? "install-claude" : "install-codex";
|
|
449
|
+
}
|
|
450
|
+
function hostLabel(host) {
|
|
451
|
+
return host === "claude" ? "Claude Code" : "Codex";
|
|
452
|
+
}
|
|
453
|
+
function refusal(action, connection, message) {
|
|
454
|
+
return {
|
|
455
|
+
ok: false,
|
|
456
|
+
error: { code: "GLOBAL_REQUIRES_FORCE", message },
|
|
457
|
+
data: { action, connection, summary: message },
|
|
458
|
+
exitCode: 2,
|
|
459
|
+
};
|
|
460
|
+
}
|
|
461
|
+
function arraysEqual(a, b) {
|
|
462
|
+
if (a.length !== b.length)
|
|
463
|
+
return false;
|
|
464
|
+
for (let i = 0; i < a.length; i += 1) {
|
|
465
|
+
if (a[i] !== b[i])
|
|
466
|
+
return false;
|
|
467
|
+
}
|
|
468
|
+
return true;
|
|
469
|
+
}
|
|
470
|
+
function recordsEqual(a, b) {
|
|
471
|
+
const keysA = Object.keys(a).sort();
|
|
472
|
+
const keysB = Object.keys(b).sort();
|
|
473
|
+
if (!arraysEqual(keysA, keysB))
|
|
474
|
+
return false;
|
|
475
|
+
for (const key of keysA) {
|
|
476
|
+
if (a[key] !== b[key])
|
|
477
|
+
return false;
|
|
478
|
+
}
|
|
479
|
+
return true;
|
|
480
|
+
}
|
|
481
|
+
//# sourceMappingURL=mcp-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mcp-config.js","sourceRoot":"","sources":["../../../src/application/self/mcp-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-close-service.d.ts","sourceRoot":"","sources":["../../src/application/session-close-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,KAAK,YAAY,EAAuB,MAAM,oBAAoB,CAAC;AAE5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EACL,KAAK,qBAAqB,EAE3B,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"session-close-service.d.ts","sourceRoot":"","sources":["../../src/application/session-close-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,KAAK,YAAY,EAAuB,MAAM,oBAAoB,CAAC;AAE5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EACL,KAAK,qBAAqB,EAE3B,MAAM,gCAAgC,CAAC;AAMxC,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,YAAY,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,EAAE,OAAO,CAAC;CAC9B;AAED,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,qBAAqB,CAAC;IACjC,YAAY,EAAE,kBAAkB,CAAC;CAClC;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,CAAC;CACf;AAWD,wBAAsB,eAAe,CACnC,EAAE,EAAE,cAAc,EAClB,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,YAAY,EACnB,KAAK,EAAE,iBAAiB,GACvB,OAAO,CAAC,sBAAsB,GAAG,iBAAiB,CAAC,CA2BrD"}
|
|
@@ -17,6 +17,34 @@ export async function runSessionClose(fs, env, paths, input) {
|
|
|
17
17
|
const session = await resolveSession(fs, env, paths, input.code, true);
|
|
18
18
|
if (!session)
|
|
19
19
|
return { error: `Sesión no encontrada: ${input.code}` };
|
|
20
|
+
const refsRendered = buildCloseRefs(input);
|
|
21
|
+
const actionResult = await markHistoryClosed(fs, paths, session, input, refsRendered);
|
|
22
|
+
if (typeof actionResult === "object")
|
|
23
|
+
return actionResult;
|
|
24
|
+
const projectMd = await runProjectMdUpsertWrite(fs, env, paths, {
|
|
25
|
+
op: "remove-session",
|
|
26
|
+
sessionFolder: session.folder,
|
|
27
|
+
});
|
|
28
|
+
if ("error" in projectMd) {
|
|
29
|
+
return { error: projectMd.error };
|
|
30
|
+
}
|
|
31
|
+
return {
|
|
32
|
+
projectMd,
|
|
33
|
+
sessionClose: {
|
|
34
|
+
code: session.code ?? input.code ?? "",
|
|
35
|
+
folder: session.folder,
|
|
36
|
+
history_action: actionResult,
|
|
37
|
+
refs: refsRendered,
|
|
38
|
+
qtc_project_updated: true,
|
|
39
|
+
},
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
function buildCloseRefs(input) {
|
|
43
|
+
const refsParts = collectCloseRefs(input);
|
|
44
|
+
const refsCombined = refsParts.length > 0 ? refsParts.join(",") : null;
|
|
45
|
+
return refsCombined ? renderRefs(refsCombined) : "—";
|
|
46
|
+
}
|
|
47
|
+
function collectCloseRefs(input) {
|
|
20
48
|
const refsParts = [];
|
|
21
49
|
for (const [key, tag] of Object.entries(FLAG_TO_TAG)) {
|
|
22
50
|
const value = input[key];
|
|
@@ -27,42 +55,24 @@ export async function runSessionClose(fs, env, paths, input) {
|
|
|
27
55
|
if (input.refs && input.refs.trim().length > 0) {
|
|
28
56
|
refsParts.push(input.refs.trim());
|
|
29
57
|
}
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
const summary = session.summary ?? "";
|
|
58
|
+
return refsParts;
|
|
59
|
+
}
|
|
60
|
+
async function markHistoryClosed(fs, paths, session, input, refsRendered) {
|
|
34
61
|
const codeNorm = session.code ?? input.code ?? "";
|
|
35
62
|
const upsertResult = await withCwdLock(fs, paths, () => upsertRow(fs, paths.cwdHistoryFile(), codeNorm, (hasFlow) => buildRow({
|
|
36
63
|
code: codeNorm,
|
|
37
64
|
flow: session.flow ?? null,
|
|
38
65
|
sesionName: session.name,
|
|
39
|
-
date,
|
|
66
|
+
date: session.date ?? formatToday(),
|
|
40
67
|
state: "closed",
|
|
41
|
-
summary,
|
|
68
|
+
summary: session.summary ?? "",
|
|
42
69
|
refs: refsRendered,
|
|
43
70
|
hasFlow,
|
|
44
71
|
})));
|
|
45
72
|
if (upsertResult && typeof upsertResult === "object" && "error" in upsertResult) {
|
|
46
73
|
return { error: upsertResult.error };
|
|
47
74
|
}
|
|
48
|
-
|
|
49
|
-
const projectMd = await runProjectMdUpsertWrite(fs, env, paths, {
|
|
50
|
-
op: "remove-session",
|
|
51
|
-
sessionFolder: session.folder,
|
|
52
|
-
});
|
|
53
|
-
if ("error" in projectMd) {
|
|
54
|
-
return { error: projectMd.error };
|
|
55
|
-
}
|
|
56
|
-
return {
|
|
57
|
-
projectMd,
|
|
58
|
-
sessionClose: {
|
|
59
|
-
code: session.code ?? input.code ?? "",
|
|
60
|
-
folder: session.folder,
|
|
61
|
-
history_action: action,
|
|
62
|
-
refs: refsRendered,
|
|
63
|
-
qtc_project_updated: true,
|
|
64
|
-
},
|
|
65
|
-
};
|
|
75
|
+
return upsertResult;
|
|
66
76
|
}
|
|
67
77
|
function formatToday() {
|
|
68
78
|
const d = new Date();
|