jazz-ai 0.2.2 → 0.4.3
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 +8 -6
- package/dist/cli/commands/chat-agent.d.ts +3 -1
- package/dist/cli/commands/chat-agent.d.ts.map +1 -1
- package/dist/cli/commands/chat-agent.js +180 -102
- package/dist/cli/commands/chat-agent.js.map +1 -1
- package/dist/cli/commands/edit-agent.d.ts +2 -2
- package/dist/cli/commands/edit-agent.d.ts.map +1 -1
- package/dist/cli/commands/edit-agent.js +20 -10
- package/dist/cli/commands/edit-agent.js.map +1 -1
- package/dist/cli/commands/task-agent.d.ts +1 -1
- package/dist/cli/commands/task-agent.d.ts.map +1 -1
- package/dist/cli/commands/task-agent.js +6 -6
- package/dist/cli/commands/task-agent.js.map +1 -1
- package/dist/constants/agent.d.ts +2 -0
- package/dist/constants/agent.d.ts.map +1 -0
- package/dist/constants/agent.js +5 -0
- package/dist/constants/agent.js.map +1 -0
- package/dist/core/agent/agent-prompt.d.ts +0 -1
- package/dist/core/agent/agent-prompt.d.ts.map +1 -1
- package/dist/core/agent/agent-prompt.js +7 -15
- package/dist/core/agent/agent-prompt.js.map +1 -1
- package/dist/core/agent/agent-runner.d.ts +15 -0
- package/dist/core/agent/agent-runner.d.ts.map +1 -1
- package/dist/core/agent/agent-runner.js +570 -270
- package/dist/core/agent/agent-runner.js.map +1 -1
- package/dist/core/agent/agent-service.d.ts +20 -5
- package/dist/core/agent/agent-service.d.ts.map +1 -1
- package/dist/core/agent/agent-service.js +54 -6
- package/dist/core/agent/agent-service.js.map +1 -1
- package/dist/core/agent/gmail-agent.js +7 -7
- package/dist/core/agent/gmail-agent.js.map +1 -1
- package/dist/core/agent/prompts/coder/v1.d.ts +2 -0
- package/dist/core/agent/prompts/coder/v1.d.ts.map +1 -0
- package/dist/core/agent/prompts/coder/v1.js +370 -0
- package/dist/core/agent/prompts/coder/v1.js.map +1 -0
- package/dist/core/agent/prompts/default/v2.d.ts +1 -1
- package/dist/core/agent/prompts/default/v2.d.ts.map +1 -1
- package/dist/core/agent/prompts/default/v2.js +1 -2
- package/dist/core/agent/prompts/default/v2.js.map +1 -1
- package/dist/core/agent/prompts/gmail/v1.d.ts +1 -1
- package/dist/core/agent/prompts/gmail/v1.d.ts.map +1 -1
- package/dist/core/agent/prompts/gmail/v1.js +5 -5
- package/dist/core/agent/prompts/gmail/v2.d.ts +1 -1
- package/dist/core/agent/prompts/gmail/v2.d.ts.map +1 -1
- package/dist/core/agent/prompts/gmail/v2.js +7 -7
- package/dist/core/agent/tools/base-tool.d.ts +3 -4
- package/dist/core/agent/tools/base-tool.d.ts.map +1 -1
- package/dist/core/agent/tools/base-tool.js +11 -51
- package/dist/core/agent/tools/base-tool.js.map +1 -1
- package/dist/core/agent/tools/context-utils.d.ts +6 -0
- package/dist/core/agent/tools/context-utils.d.ts.map +1 -0
- package/dist/core/agent/tools/context-utils.js +9 -0
- package/dist/core/agent/tools/context-utils.js.map +1 -0
- package/dist/core/agent/tools/env-utils.d.ts +7 -0
- package/dist/core/agent/tools/env-utils.d.ts.map +1 -0
- package/dist/core/agent/tools/env-utils.js +39 -0
- package/dist/core/agent/tools/env-utils.js.map +1 -0
- package/dist/core/agent/tools/fs-tools.d.ts.map +1 -1
- package/dist/core/agent/tools/fs-tools.js +48 -53
- package/dist/core/agent/tools/fs-tools.js.map +1 -1
- package/dist/core/agent/tools/git-tools.d.ts +5 -0
- package/dist/core/agent/tools/git-tools.d.ts.map +1 -1
- package/dist/core/agent/tools/git-tools.js +716 -154
- package/dist/core/agent/tools/git-tools.js.map +1 -1
- package/dist/core/agent/tools/gmail-tools.js +35 -35
- package/dist/core/agent/tools/gmail-tools.js.map +1 -1
- package/dist/core/agent/tools/http-tools.js +2 -2
- package/dist/core/agent/tools/http-tools.js.map +1 -1
- package/dist/core/agent/tools/register-tools.d.ts +18 -1
- package/dist/core/agent/tools/register-tools.d.ts.map +1 -1
- package/dist/core/agent/tools/register-tools.js +52 -6
- package/dist/core/agent/tools/register-tools.js.map +1 -1
- package/dist/core/agent/tools/shell-tools.d.ts.map +1 -1
- package/dist/core/agent/tools/shell-tools.js +10 -20
- package/dist/core/agent/tools/shell-tools.js.map +1 -1
- package/dist/core/agent/tools/tool-registry.d.ts +11 -7
- package/dist/core/agent/tools/tool-registry.d.ts.map +1 -1
- package/dist/core/agent/tools/tool-registry.js +45 -19
- package/dist/core/agent/tools/tool-registry.js.map +1 -1
- package/dist/core/agent/tools/web-search-tools.js +1 -1
- package/dist/core/agent/tools/web-search-tools.js.map +1 -1
- package/dist/core/agent/tracking/agent-run-tracker.d.ts +2 -0
- package/dist/core/agent/tracking/agent-run-tracker.d.ts.map +1 -1
- package/dist/core/agent/tracking/agent-run-tracker.js +40 -2
- package/dist/core/agent/tracking/agent-run-tracker.js.map +1 -1
- package/dist/core/types/index.d.ts +82 -15
- package/dist/core/types/index.d.ts.map +1 -1
- package/dist/core/types/index.js.map +1 -1
- package/dist/core/utils/markdown-renderer.d.ts +25 -0
- package/dist/core/utils/markdown-renderer.d.ts.map +1 -1
- package/dist/core/utils/markdown-renderer.js +100 -1
- package/dist/core/utils/markdown-renderer.js.map +1 -1
- package/dist/core/utils/output-renderer.d.ts +81 -0
- package/dist/core/utils/output-renderer.d.ts.map +1 -0
- package/dist/core/utils/output-renderer.js +291 -0
- package/dist/core/utils/output-renderer.js.map +1 -0
- package/dist/core/utils/output-theme.d.ts +64 -0
- package/dist/core/utils/output-theme.d.ts.map +1 -0
- package/dist/core/utils/output-theme.js +154 -0
- package/dist/core/utils/output-theme.js.map +1 -0
- package/dist/core/utils/output-writer.d.ts +79 -0
- package/dist/core/utils/output-writer.d.ts.map +1 -0
- package/dist/core/utils/output-writer.js +133 -0
- package/dist/core/utils/output-writer.js.map +1 -0
- package/dist/core/utils/runtime-detection.d.ts +28 -0
- package/dist/core/utils/runtime-detection.d.ts.map +1 -0
- package/dist/core/utils/runtime-detection.js +62 -0
- package/dist/core/utils/runtime-detection.js.map +1 -0
- package/dist/core/utils/string.d.ts +8 -0
- package/dist/core/utils/string.d.ts.map +1 -0
- package/dist/core/utils/string.js +19 -0
- package/dist/core/utils/string.js.map +1 -0
- package/dist/core/utils/thinking-renderer.d.ts +56 -0
- package/dist/core/utils/thinking-renderer.d.ts.map +1 -0
- package/dist/core/utils/thinking-renderer.js +174 -0
- package/dist/core/utils/thinking-renderer.js.map +1 -0
- package/dist/core/utils/tool-formatter.d.ts +21 -0
- package/dist/core/utils/tool-formatter.d.ts.map +1 -0
- package/dist/core/utils/tool-formatter.js +343 -0
- package/dist/core/utils/tool-formatter.js.map +1 -0
- package/dist/main.js +11 -4
- package/dist/main.js.map +1 -1
- package/dist/services/config.d.ts.map +1 -1
- package/dist/services/config.js +20 -20
- package/dist/services/config.js.map +1 -1
- package/dist/services/llm/ai-sdk-service.d.ts.map +1 -1
- package/dist/services/llm/ai-sdk-service.js +128 -37
- package/dist/services/llm/ai-sdk-service.js.map +1 -1
- package/dist/services/llm/stream-detector.d.ts +44 -0
- package/dist/services/llm/stream-detector.d.ts.map +1 -0
- package/dist/services/llm/stream-detector.js +81 -0
- package/dist/services/llm/stream-detector.js.map +1 -0
- package/dist/services/llm/stream-processor.d.ts +93 -0
- package/dist/services/llm/stream-processor.d.ts.map +1 -0
- package/dist/services/llm/stream-processor.js +330 -0
- package/dist/services/llm/stream-processor.js.map +1 -0
- package/dist/services/llm/streaming-types.d.ts +131 -0
- package/dist/services/llm/streaming-types.d.ts.map +1 -0
- package/dist/services/llm/streaming-types.js +12 -0
- package/dist/services/llm/streaming-types.js.map +1 -0
- package/dist/services/llm/types.d.ts +8 -0
- package/dist/services/llm/types.d.ts.map +1 -1
- package/dist/services/llm/types.js.map +1 -1
- package/dist/services/logger.d.ts +4 -4
- package/dist/services/logger.d.ts.map +1 -1
- package/dist/services/logger.js +23 -45
- package/dist/services/logger.js.map +1 -1
- package/dist/services/shell.d.ts.map +1 -1
- package/dist/services/shell.js +52 -18
- package/dist/services/shell.js.map +1 -1
- package/package.json +1 -1
package/dist/services/logger.js
CHANGED
|
@@ -10,6 +10,7 @@ exports.logToolExecutionSuccess = logToolExecutionSuccess;
|
|
|
10
10
|
exports.logToolExecutionError = logToolExecutionError;
|
|
11
11
|
exports.logToolExecutionApproval = logToolExecutionApproval;
|
|
12
12
|
const effect_1 = require("effect");
|
|
13
|
+
const tool_formatter_1 = require("../core/utils/tool-formatter");
|
|
13
14
|
const config_1 = require("./config");
|
|
14
15
|
class LoggerServiceImpl {
|
|
15
16
|
constructor() { }
|
|
@@ -208,19 +209,16 @@ function logAutomationEvent(automationId, event, meta) {
|
|
|
208
209
|
});
|
|
209
210
|
}
|
|
210
211
|
// Tool execution logging helpers
|
|
211
|
-
function logToolExecutionStart(toolName,
|
|
212
|
+
function logToolExecutionStart(toolName, args) {
|
|
212
213
|
return effect_1.Effect.gen(function* () {
|
|
213
214
|
const logger = yield* exports.LoggerServiceTag;
|
|
214
215
|
const toolEmoji = getToolEmoji(toolName);
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
conversationId,
|
|
219
|
-
status: "started",
|
|
220
|
-
});
|
|
216
|
+
const argsText = (0, tool_formatter_1.formatToolArguments)(toolName, args, { style: "plain" });
|
|
217
|
+
const message = argsText ? `${toolEmoji} ${toolName} ${argsText}` : `${toolEmoji} ${toolName}`;
|
|
218
|
+
yield* logger.info(message);
|
|
221
219
|
});
|
|
222
220
|
}
|
|
223
|
-
function logToolExecutionSuccess(toolName,
|
|
221
|
+
function logToolExecutionSuccess(toolName, durationMs, resultSummary) {
|
|
224
222
|
return effect_1.Effect.gen(function* () {
|
|
225
223
|
const logger = yield* exports.LoggerServiceTag;
|
|
226
224
|
const toolEmoji = getToolEmoji(toolName);
|
|
@@ -228,63 +226,43 @@ function logToolExecutionSuccess(toolName, agentId, durationMs, conversationId,
|
|
|
228
226
|
const message = resultSummary
|
|
229
227
|
? `${toolEmoji} ${toolName} ✅ (${duration}) - ${resultSummary}`
|
|
230
228
|
: `${toolEmoji} ${toolName} ✅ (${duration})`;
|
|
231
|
-
yield* logger.info(message
|
|
232
|
-
toolName,
|
|
233
|
-
agentId,
|
|
234
|
-
conversationId,
|
|
235
|
-
durationMs,
|
|
236
|
-
status: "success",
|
|
237
|
-
});
|
|
229
|
+
yield* logger.info(message);
|
|
238
230
|
});
|
|
239
231
|
}
|
|
240
|
-
function logToolExecutionError(toolName,
|
|
232
|
+
function logToolExecutionError(toolName, durationMs, error) {
|
|
241
233
|
return effect_1.Effect.gen(function* () {
|
|
242
234
|
const logger = yield* exports.LoggerServiceTag;
|
|
243
235
|
const toolEmoji = getToolEmoji(toolName);
|
|
244
236
|
const duration = formatDuration(durationMs);
|
|
245
237
|
const message = `${toolEmoji} ${toolName} ✗ (${duration}) - ${error}`;
|
|
246
|
-
yield* logger.error(message
|
|
247
|
-
toolName,
|
|
248
|
-
agentId,
|
|
249
|
-
conversationId,
|
|
250
|
-
durationMs,
|
|
251
|
-
status: "error",
|
|
252
|
-
error,
|
|
253
|
-
});
|
|
238
|
+
yield* logger.error(message);
|
|
254
239
|
});
|
|
255
240
|
}
|
|
256
|
-
function logToolExecutionApproval(toolName,
|
|
241
|
+
function logToolExecutionApproval(toolName, durationMs, approvalMessage) {
|
|
257
242
|
return effect_1.Effect.gen(function* () {
|
|
258
243
|
const logger = yield* exports.LoggerServiceTag;
|
|
259
244
|
const toolEmoji = getToolEmoji(toolName);
|
|
260
245
|
const duration = formatDuration(durationMs);
|
|
261
246
|
const message = `${toolEmoji} ${toolName} ⚠️ APPROVE REQUIRED (${duration}) - ${approvalMessage}`;
|
|
262
|
-
yield* logger.warn(message
|
|
263
|
-
toolName,
|
|
264
|
-
agentId,
|
|
265
|
-
conversationId,
|
|
266
|
-
durationMs,
|
|
267
|
-
status: "approval_required",
|
|
268
|
-
approvalMessage,
|
|
269
|
-
});
|
|
247
|
+
yield* logger.warn(message);
|
|
270
248
|
});
|
|
271
249
|
}
|
|
272
250
|
// Utility functions for tool logging
|
|
273
251
|
function getToolEmoji(toolName) {
|
|
274
252
|
const toolEmojis = {
|
|
275
253
|
// Gmail tools
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
254
|
+
list_emails: "📧",
|
|
255
|
+
get_email: "📨",
|
|
256
|
+
send_email: "📤",
|
|
257
|
+
reply_to_email: "↩️",
|
|
258
|
+
forward_email: "↗️",
|
|
259
|
+
mark_as_read: "👁️",
|
|
260
|
+
mark_as_unread: "👁️🗨️",
|
|
261
|
+
delete_email: "🗑️",
|
|
262
|
+
create_label: "🏷️",
|
|
263
|
+
add_label: "🏷️",
|
|
264
|
+
remove_label: "🏷️",
|
|
265
|
+
search_emails: "🔍",
|
|
288
266
|
// Default
|
|
289
267
|
default: "🔧",
|
|
290
268
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/services/logger.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/services/logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell.d.ts","sourceRoot":"","sources":["../../src/services/shell.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"shell.d.ts","sourceRoot":"","sources":["../../src/services/shell.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAGhD,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC9F,QAAQ,CAAC,MAAM,EAAE,CACf,GAAG,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EACjD,IAAI,EAAE,MAAM,KACT,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;IACvD,QAAQ,CAAC,WAAW,EAAE,CACpB,GAAG,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EACjD,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;QAAE,kBAAkB,CAAC,EAAE,OAAO,CAAA;KAAE,KACvC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;IACzD,QAAQ,CAAC,aAAa,EAAE,CACtB,GAAG,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EACjD,IAAI,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,MAAM,KACd,MAAM,CAAC,MAAM,CAChB;QAAE,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;QAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,EAC5D,KAAK,EACL,UAAU,CAAC,UAAU,CACtB,CAAC;IACF,QAAQ,CAAC,mBAAmB,EAAE,CAC5B,GAAG,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EACjD,IAAI,EAAE,MAAM,KACT,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;IACzD,QAAQ,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CAC/C;AAED,eAAO,MAAM,2BAA2B,iEAEvC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,mCAAmC,IAAI,KAAK,CAAC,KAAK,CAChE,wBAAwB,EACxB,KAAK,EACL,UAAU,CAAC,UAAU,CACtB,CAuSA"}
|
package/dist/services/shell.js
CHANGED
|
@@ -2,9 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.FileSystemContextServiceTag = void 0;
|
|
4
4
|
exports.createFileSystemContextServiceLayer = createFileSystemContextServiceLayer;
|
|
5
|
+
const tslib_1 = require("tslib");
|
|
5
6
|
const platform_1 = require("@effect/platform");
|
|
6
7
|
const child_process_1 = require("child_process");
|
|
7
8
|
const effect_1 = require("effect");
|
|
9
|
+
const nodePath = tslib_1.__importStar(require("path"));
|
|
8
10
|
exports.FileSystemContextServiceTag = effect_1.Context.GenericTag("FileSystemContextService");
|
|
9
11
|
/**
|
|
10
12
|
* filesystem context service that tracks a working directory per agent/conversation.
|
|
@@ -125,20 +127,36 @@ function createFileSystemContextServiceLayer() {
|
|
|
125
127
|
const base = cwdByKey.get(makeKey(key)) ?? process.cwd();
|
|
126
128
|
// Normalize the path first
|
|
127
129
|
const normalizedPath = normalize(path);
|
|
128
|
-
//
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
130
|
+
// Handle special cases: "." and ".."
|
|
131
|
+
let resolved;
|
|
132
|
+
if (normalizedPath === ".") {
|
|
133
|
+
resolved = base;
|
|
134
|
+
}
|
|
135
|
+
else if (normalizedPath === "..") {
|
|
136
|
+
// Go up one directory from base
|
|
137
|
+
const parent = base.substring(0, base.lastIndexOf("/"));
|
|
138
|
+
resolved = parent || "/";
|
|
139
|
+
}
|
|
140
|
+
else if (normalizedPath.startsWith("/")) {
|
|
141
|
+
// Absolute path
|
|
142
|
+
resolved = normalizedPath;
|
|
143
|
+
}
|
|
144
|
+
else {
|
|
145
|
+
// Relative path - combine with base
|
|
146
|
+
resolved = `${base}/${normalizedPath}`;
|
|
147
|
+
}
|
|
148
|
+
// Normalize the resolved path to remove . and .. components
|
|
149
|
+
const cleanedPath = nodePath.normalize(resolved);
|
|
132
150
|
// If skipExistenceCheck is true, return the resolved path without checking existence
|
|
133
151
|
if (options.skipExistenceCheck) {
|
|
134
|
-
return
|
|
152
|
+
return cleanedPath;
|
|
135
153
|
}
|
|
136
154
|
// Check if the resolved path exists
|
|
137
155
|
const statResult = yield* fs
|
|
138
|
-
.stat(
|
|
156
|
+
.stat(cleanedPath)
|
|
139
157
|
.pipe(effect_1.Effect.catchAll(() => effect_1.Effect.succeed(null)));
|
|
140
158
|
if (statResult) {
|
|
141
|
-
return
|
|
159
|
+
return cleanedPath;
|
|
142
160
|
}
|
|
143
161
|
else {
|
|
144
162
|
// If it's a relative path and doesn't exist, try to find similar directories
|
|
@@ -150,13 +168,13 @@ function createFileSystemContextServiceLayer() {
|
|
|
150
168
|
const found = yield* findDirectoryByName(base, targetName, 3);
|
|
151
169
|
if (found.results.length > 0) {
|
|
152
170
|
const suggestion = found.results[0];
|
|
153
|
-
throw new Error(`Path not found: ${
|
|
171
|
+
throw new Error(`Path not found: ${cleanedPath}\n` +
|
|
154
172
|
`Did you mean: ${suggestion}?\n` +
|
|
155
173
|
`Found ${found.results.length} similar directory${found.results.length > 1 ? "ies" : "y"}: ${found.results.join(", ")}`);
|
|
156
174
|
}
|
|
157
175
|
}
|
|
158
176
|
}
|
|
159
|
-
return yield* effect_1.Effect.fail(new Error(`Path not found: ${
|
|
177
|
+
return yield* effect_1.Effect.fail(new Error(`Path not found: ${cleanedPath}`));
|
|
160
178
|
}
|
|
161
179
|
}),
|
|
162
180
|
findDirectory: (key, name, maxDepth = 3) => effect_1.Effect.gen(function* () {
|
|
@@ -167,27 +185,43 @@ function createFileSystemContextServiceLayer() {
|
|
|
167
185
|
const base = cwdByKey.get(makeKey(key)) ?? process.cwd();
|
|
168
186
|
// Normalize the path first
|
|
169
187
|
const normalizedPath = normalize(path);
|
|
170
|
-
//
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
188
|
+
// Handle special cases: "." and ".."
|
|
189
|
+
let resolved;
|
|
190
|
+
if (normalizedPath === ".") {
|
|
191
|
+
resolved = base;
|
|
192
|
+
}
|
|
193
|
+
else if (normalizedPath === "..") {
|
|
194
|
+
// Go up one directory from base
|
|
195
|
+
const parent = base.substring(0, base.lastIndexOf("/"));
|
|
196
|
+
resolved = parent || "/";
|
|
197
|
+
}
|
|
198
|
+
else if (normalizedPath.startsWith("/")) {
|
|
199
|
+
// Absolute path
|
|
200
|
+
resolved = normalizedPath;
|
|
201
|
+
}
|
|
202
|
+
else {
|
|
203
|
+
// Relative path - combine with base
|
|
204
|
+
resolved = `${base}/${normalizedPath}`;
|
|
205
|
+
}
|
|
206
|
+
// Normalize the resolved path to remove . and .. components
|
|
207
|
+
const cleanedPath = nodePath.normalize(resolved);
|
|
174
208
|
// For mkdir, we need to check if the parent directory exists
|
|
175
|
-
const parentDir =
|
|
209
|
+
const parentDir = cleanedPath.substring(0, cleanedPath.lastIndexOf("/"));
|
|
176
210
|
// If parentDir is empty, it means we're creating in root
|
|
177
211
|
if (parentDir === "") {
|
|
178
|
-
return
|
|
212
|
+
return cleanedPath;
|
|
179
213
|
}
|
|
180
214
|
// Check if the parent directory exists
|
|
181
215
|
const parentStatResult = yield* fs
|
|
182
216
|
.stat(parentDir)
|
|
183
217
|
.pipe(effect_1.Effect.catchAll(() => effect_1.Effect.succeed(null)));
|
|
184
218
|
if (!parentStatResult) {
|
|
185
|
-
return yield* effect_1.Effect.fail(new Error(`Cannot create directory '${
|
|
219
|
+
return yield* effect_1.Effect.fail(new Error(`Cannot create directory '${cleanedPath}': parent directory '${parentDir}' does not exist. Use recursive=true to create parent directories.`));
|
|
186
220
|
}
|
|
187
221
|
if (parentStatResult.type !== "Directory") {
|
|
188
|
-
return yield* effect_1.Effect.fail(new Error(`Cannot create directory '${
|
|
222
|
+
return yield* effect_1.Effect.fail(new Error(`Cannot create directory '${cleanedPath}': '${parentDir}' is not a directory.`));
|
|
189
223
|
}
|
|
190
|
-
return
|
|
224
|
+
return cleanedPath;
|
|
191
225
|
}),
|
|
192
226
|
escapePath: (path) => escapeForShell(path),
|
|
193
227
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/services/shell.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/services/shell.ts"],"names":[],"mappings":";;;AAwCA,kFA2SC;;AAnVD,+CAA8C;AAC9C,iDAAsC;AACtC,mCAAgD;AAChD,uDAAiC;AA6BpB,QAAA,2BAA2B,GAAG,gBAAO,CAAC,UAAU,CAC3D,0BAA0B,CAC3B,CAAC;AAEF;;;GAGG;AACH,SAAgB,mCAAmC;IAKjD,OAAO,cAAK,CAAC,MAAM,CACjB,mCAA2B,EAC3B,eAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,qBAAU,CAAC,UAAU,CAAC;QAExC,0CAA0C;QAC1C,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAC;QAE3C,SAAS,OAAO,CAAC,GAAiD;YAChE,OAAO,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC;QACnF,CAAC;QAED,SAAS,SAAS,CAAC,CAAS;YAC1B,8EAA8E;YAC9E,IAAI,UAAU,GAAG,CAAC,CAAC;YACnB,IACE,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBACxD,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EACxD,CAAC;gBACD,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YACvC,CAAC;YAED,2EAA2E;YAC3E,wFAAwF;YACxF,+EAA+E;YAC/E,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YAEhD,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,SAAS,cAAc,CAAC,IAAY;YAClC,8CAA8C;YAC9C,oEAAoE;YACpE,IACE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAClB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAClB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAClB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAClB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAClB,CAAC;gBACD,wCAAwC;gBACxC,IACE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;oBAC5C,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAC5C,CAAC;oBACD,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC;YAC1C,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC;QAED,SAAS,mBAAmB,CAC1B,SAAiB,EACjB,UAAkB,EAClB,QAAgB;YAEhB,OAAO,eAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBACzB,yCAAyC;gBACzC,MAAM,OAAO,GAAG,QAAQ,cAAc,CAAC,SAAS,CAAC,cAAc,QAAQ,qBAAqB,UAAU,IAAI,CAAC;gBAC3G,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,eAAM,CAAC,OAAO,CAKlC,GAAG,EAAE,CACH,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBAC9B,MAAM,KAAK,GAAG,IAAA,qBAAK,EAAC,IAAI,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE;wBACzC,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;wBACjC,OAAO,EAAE,KAAK;qBACf,CAAC,CAAC;oBAEH,IAAI,MAAM,GAAG,EAAE,CAAC;oBAChB,IAAI,MAAM,GAAG,EAAE,CAAC;oBAEhB,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;wBACjB,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;4BACvC,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;wBAC5B,CAAC,CAAC,CAAC;oBACL,CAAC;oBAED,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;wBACjB,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;4BACvC,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;wBAC5B,CAAC,CAAC,CAAC;oBACL,CAAC;oBAED,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAmB,EAAE,EAAE;wBACxC,OAAO,CAAC;4BACN,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE;4BACrB,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE;4BACrB,QAAQ,EAAE,IAAI,IAAI,CAAC;yBACpB,CAAC,CAAC;oBACL,CAAC,CAAC,CAAC;oBAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;wBACjC,MAAM,CAAC,KAAK,CAAC,CAAC;oBAChB,CAAC,CAAC,CAAC;gBACL,CAAC,CAAC,CACL,CAAC,IAAI,CACJ,eAAM,CAAC,QAAQ,CAAC,CAAC,KAAY,EAAE,EAAE,CAC/B,eAAM,CAAC,OAAO,CAAC;oBACb,MAAM,EAAE,EAAE;oBACV,MAAM,EAAE,KAAK,CAAC,OAAO;oBACrB,QAAQ,EAAE,CAAC;iBACZ,CAAC,CACH,CACF,CAAC;gBAEF,yBAAyB;gBACzB,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM;qBAC1B,KAAK,CAAC,IAAI,CAAC;qBACX,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;qBAC7B,IAAI,EAAE,CAAC;gBAEV,MAAM,QAAQ,GAAa,EAAE,CAAC;gBAE9B,oFAAoF;gBACpF,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;oBAC3C,QAAQ,CAAC,IAAI,CAAC,oCAAoC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;gBACrE,CAAC;gBAED,8DAA8D;gBAC9D,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;oBAClD,QAAQ,CAAC,IAAI,CACX,kCAAkC,UAAU,QAAQ,SAAS,gBAAgB,QAAQ,GAAG,CACzF,CAAC;gBACJ,CAAC;gBAED,OAAO;oBACL,OAAO;oBACP,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC;iBACzC,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC;QAED,MAAM,OAAO,GAA6B;YACxC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,eAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YAE/E,MAAM,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CACpB,eAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAClB,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;gBAC/B,mDAAmD;gBACnD,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,EAAE;qBACzB,IAAI,CAAC,MAAM,CAAC;qBACZ,IAAI,CAAC,eAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,eAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAErD,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,OAAO,KAAK,CAAC,CAAC,eAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,6BAA6B,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC9E,CAAC;gBAED,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,KAAK,WAAW,CAAC;gBAC9C,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,OAAO,KAAK,CAAC,CAAC,eAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,oBAAoB,MAAM,EAAE,CAAC,CAAC,CAAC;gBACrE,CAAC;gBAED,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;YACrC,CAAC,CAAC;YAEJ,WAAW,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE,CACvC,eAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAClB,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;gBAEzD,2BAA2B;gBAC3B,MAAM,cAAc,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;gBAEvC,qCAAqC;gBACrC,IAAI,QAAgB,CAAC;gBACrB,IAAI,cAAc,KAAK,GAAG,EAAE,CAAC;oBAC3B,QAAQ,GAAG,IAAI,CAAC;gBAClB,CAAC;qBAAM,IAAI,cAAc,KAAK,IAAI,EAAE,CAAC;oBACnC,gCAAgC;oBAChC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;oBACxD,QAAQ,GAAG,MAAM,IAAI,GAAG,CAAC;gBAC3B,CAAC;qBAAM,IAAI,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC1C,gBAAgB;oBAChB,QAAQ,GAAG,cAAc,CAAC;gBAC5B,CAAC;qBAAM,CAAC;oBACN,oCAAoC;oBACpC,QAAQ,GAAG,GAAG,IAAI,IAAI,cAAc,EAAE,CAAC;gBACzC,CAAC;gBAED,4DAA4D;gBAC5D,MAAM,WAAW,GAAG,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;gBAEjD,qFAAqF;gBACrF,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC;oBAC/B,OAAO,WAAW,CAAC;gBACrB,CAAC;gBAED,oCAAoC;gBACpC,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,EAAE;qBACzB,IAAI,CAAC,WAAW,CAAC;qBACjB,IAAI,CAAC,eAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,eAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAErD,IAAI,UAAU,EAAE,CAAC;oBACf,OAAO,WAAW,CAAC;gBACrB,CAAC;qBAAM,CAAC;oBACN,6EAA6E;oBAC7E,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;wBACpC,MAAM,SAAS,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;wBAC5C,MAAM,UAAU,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;wBAEnD,IAAI,UAAU,EAAE,CAAC;4BACf,4CAA4C;4BAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;4BAC9D,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gCAC7B,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;gCACpC,MAAM,IAAI,KAAK,CACb,mBAAmB,WAAW,IAAI;oCAChC,iBAAiB,UAAU,KAAK;oCAChC,SAAS,KAAK,CAAC,OAAO,CAAC,MAAM,qBAAqB,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC1H,CAAC;4BACJ,CAAC;wBACH,CAAC;oBACH,CAAC;oBAED,OAAO,KAAK,CAAC,CAAC,eAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,mBAAmB,WAAW,EAAE,CAAC,CAAC,CAAC;gBACzE,CAAC;YACH,CAAC,CAAC;YAEJ,aAAa,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,GAAG,CAAC,EAAE,EAAE,CACzC,eAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAClB,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;gBACzD,OAAO,KAAK,CAAC,CAAC,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC1D,CAAC,CAAC;YAEJ,mBAAmB,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CACjC,eAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAClB,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;gBAEzD,2BAA2B;gBAC3B,MAAM,cAAc,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;gBAEvC,qCAAqC;gBACrC,IAAI,QAAgB,CAAC;gBACrB,IAAI,cAAc,KAAK,GAAG,EAAE,CAAC;oBAC3B,QAAQ,GAAG,IAAI,CAAC;gBAClB,CAAC;qBAAM,IAAI,cAAc,KAAK,IAAI,EAAE,CAAC;oBACnC,gCAAgC;oBAChC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;oBACxD,QAAQ,GAAG,MAAM,IAAI,GAAG,CAAC;gBAC3B,CAAC;qBAAM,IAAI,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC1C,gBAAgB;oBAChB,QAAQ,GAAG,cAAc,CAAC;gBAC5B,CAAC;qBAAM,CAAC;oBACN,oCAAoC;oBACpC,QAAQ,GAAG,GAAG,IAAI,IAAI,cAAc,EAAE,CAAC;gBACzC,CAAC;gBAED,4DAA4D;gBAC5D,MAAM,WAAW,GAAG,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;gBAEjD,6DAA6D;gBAC7D,MAAM,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;gBAEzE,yDAAyD;gBACzD,IAAI,SAAS,KAAK,EAAE,EAAE,CAAC;oBACrB,OAAO,WAAW,CAAC;gBACrB,CAAC;gBAED,uCAAuC;gBACvC,MAAM,gBAAgB,GAAG,KAAK,CAAC,CAAC,EAAE;qBAC/B,IAAI,CAAC,SAAS,CAAC;qBACf,IAAI,CAAC,eAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,eAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAErD,IAAI,CAAC,gBAAgB,EAAE,CAAC;oBACtB,OAAO,KAAK,CAAC,CAAC,eAAM,CAAC,IAAI,CACvB,IAAI,KAAK,CACP,4BAA4B,WAAW,wBAAwB,SAAS,oEAAoE,CAC7I,CACF,CAAC;gBACJ,CAAC;gBAED,IAAI,gBAAgB,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBAC1C,OAAO,KAAK,CAAC,CAAC,eAAM,CAAC,IAAI,CACvB,IAAI,KAAK,CACP,4BAA4B,WAAW,OAAO,SAAS,uBAAuB,CAE/E,CACF,CAAC;gBACJ,CAAC;gBAED,OAAO,WAAW,CAAC;YACrB,CAAC,CAAC;YAEJ,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC;SAC3C,CAAC;QAEF,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC,CACH,CAAC;AACJ,CAAC"}
|