Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/cli/commands/access.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ function createAccessGrantCommand(): Command {
},
);
} catch (error) {
handleError(error, fmt, { sessionServer: creds.server });
handleError(error, fmt, { creds, scope: "space" });
}
},
);
Expand Down Expand Up @@ -111,7 +111,7 @@ function createAccessRmGrantCommand(): Command {
}
});
} catch (error) {
handleError(error, fmt, { sessionServer: creds.server });
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand Down Expand Up @@ -162,7 +162,7 @@ function createAccessListCommand(): Command {
);
});
} catch (error) {
handleError(error, fmt, { sessionServer: creds.server });
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand Down
14 changes: 7 additions & 7 deletions packages/cli/commands/agent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function createAgentListCommand(): Command {
);
});
} catch (error) {
handleError(error, fmt, { sessionServer: creds.server });
handleError(error, fmt, { creds });
}
});
}
Expand All @@ -78,7 +78,7 @@ function createAgentCreateCommand(): Command {
);
});
} catch (error) {
handleError(error, fmt, { sessionServer: creds.server });
handleError(error, fmt, { creds });
}
});
}
Expand All @@ -102,7 +102,7 @@ function createAgentRenameCommand(): Command {
clack.log.success(`Renamed agent → '${newName}'`);
});
} catch (error) {
handleError(error, fmt, { sessionServer: creds.server });
handleError(error, fmt, { creds });
}
});
}
Expand All @@ -127,7 +127,7 @@ function createAgentDeleteCommand(): Command {
else clack.log.warn("Agent not found.");
});
} catch (error) {
handleError(error, fmt, { sessionServer: creds.server });
handleError(error, fmt, { creds });
}
});
}
Expand All @@ -154,7 +154,7 @@ function createAgentAddCommand(): Command {
clack.log.info("Mint a key with 'me apikey create'.");
});
} catch (error) {
handleError(error, fmt, { sessionServer: creds.server });
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand Down Expand Up @@ -194,7 +194,7 @@ function createAgentSpacesCommand(): Command {
);
});
} catch (error) {
handleError(error, fmt, { sessionServer: creds.server });
handleError(error, fmt, { creds });
}
});
}
Expand Down Expand Up @@ -226,7 +226,7 @@ function createAgentGroupsCommand(): Command {
);
});
} catch (error) {
handleError(error, fmt, { sessionServer: creds.server });
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand Down
8 changes: 4 additions & 4 deletions packages/cli/commands/apikey.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function createApiKeyCreateCommand(): Command {
);
});
} catch (error) {
handleError(error, fmt, { sessionServer: creds.server });
handleError(error, fmt, { creds });
}
},
);
Expand Down Expand Up @@ -122,7 +122,7 @@ function createApiKeyListCommand(): Command {
);
});
} catch (error) {
handleError(error, fmt, { sessionServer: creds.server });
handleError(error, fmt, { creds });
}
});
}
Expand Down Expand Up @@ -152,7 +152,7 @@ function createApiKeyGetCommand(): Command {
console.log(` Expires: ${apiKey.expiresAt ?? "(never)"}`);
});
} catch (error) {
handleError(error, fmt, { sessionServer: creds.server });
handleError(error, fmt, { creds });
}
});
}
Expand Down Expand Up @@ -188,7 +188,7 @@ function createApiKeyDeleteCommand(): Command {
else clack.log.warn("API key not found.");
});
} catch (error) {
handleError(error, fmt, { sessionServer: creds.server });
handleError(error, fmt, { creds });
}
});
}
Expand Down
16 changes: 8 additions & 8 deletions packages/cli/commands/group.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ function createGroupListCommand(): Command {
);
});
} catch (error) {
handleError(error, fmt, { sessionServer: creds.server });
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand All @@ -111,7 +111,7 @@ function createGroupCreateCommand(): Command {
clack.log.success(`Created group '${name}' (${id})`);
});
} catch (error) {
handleError(error, fmt, { sessionServer: creds.server });
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand All @@ -136,7 +136,7 @@ function createGroupRenameCommand(): Command {
clack.log.success(`Renamed group → '${newName}'`);
});
} catch (error) {
handleError(error, fmt, { sessionServer: creds.server });
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand All @@ -162,7 +162,7 @@ function createGroupDeleteCommand(): Command {
else clack.log.warn("Group not found.");
});
} catch (error) {
handleError(error, fmt, { sessionServer: creds.server });
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand Down Expand Up @@ -195,7 +195,7 @@ function createGroupAddCommand(): Command {
);
});
} catch (error) {
handleError(error, fmt, { sessionServer: creds.server });
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand Down Expand Up @@ -224,7 +224,7 @@ function createGroupRemoveCommand(): Command {
else clack.log.warn("Member not in group.");
});
} catch (error) {
handleError(error, fmt, { sessionServer: creds.server });
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand Down Expand Up @@ -260,7 +260,7 @@ function createGroupMembersCommand(): Command {
);
});
} catch (error) {
handleError(error, fmt, { sessionServer: creds.server });
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand Down Expand Up @@ -293,7 +293,7 @@ function createGroupMineCommand(): Command {
);
});
} catch (error) {
handleError(error, fmt, { sessionServer: creds.server });
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/commands/import-git.ts
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ export async function runGitImport(
range = `${highWater}..${rev}`;
}
} catch (error) {
handleError(error, fmt);
handleError(error, fmt, { creds, scope: "space" });
}
}

Expand Down Expand Up @@ -245,7 +245,7 @@ export async function runGitImport(
}
} catch (error) {
progress?.stop();
handleError(error, fmt);
handleError(error, fmt, { creds, scope: "space" });
}

// Dedup on the commit sha (the (tree, name) key), not the random id.
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/commands/import.ts
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ export async function runAgentImport(
);
} catch (error) {
progress?.stop();
handleError(error, fmt);
handleError(error, fmt, { creds, scope: "space" });
} finally {
progress?.stop();
}
Expand Down
24 changes: 12 additions & 12 deletions packages/cli/commands/memory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ function createMemoryCreateCommand(): Command {
if (memory.name) console.log(` Name: ${memory.name}`);
});
} catch (error) {
handleError(error, fmt);
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand Down Expand Up @@ -308,7 +308,7 @@ function createMemoryGetCommand(): Command {

console.log(`\n${header}\n\n${rendered.trimEnd()}\n`);
} catch (error) {
handleError(error, fmt);
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand Down Expand Up @@ -464,7 +464,7 @@ function createMemorySearchCommand(): Command {
);
});
} catch (error) {
handleError(error, fmt);
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand Down Expand Up @@ -544,7 +544,7 @@ function createMemoryUpdateCommand(): Command {
clack.log.success(`Updated memory ${memory.id}`);
});
} catch (error) {
handleError(error, fmt);
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand Down Expand Up @@ -595,7 +595,7 @@ function createMemoryDeleteCommand(): Command {
// Couldn't probe the subtree — fall through to the original error.
}
}
handleError(error, fmt);
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand Down Expand Up @@ -657,7 +657,7 @@ function createMemoryDeltreeCommand(): Command {
);
});
} catch (error) {
handleError(error, fmt);
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand All @@ -678,7 +678,7 @@ function createMemoryEditCommand(): Command {
try {
await editMemory(client, id);
} catch (error) {
handleError(error, fmt);
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand Down Expand Up @@ -712,7 +712,7 @@ function createMemoryCountCommand(): Command {
}
});
} catch (error) {
handleError(error, fmt);
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand Down Expand Up @@ -748,7 +748,7 @@ function createMemoryTreeCommand(): Command {
}
});
} catch (error) {
handleError(error, fmt);
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand Down Expand Up @@ -822,7 +822,7 @@ function createMemoryMoveCommand(): Command {
);
});
} catch (error) {
handleError(error, fmt);
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand Down Expand Up @@ -896,7 +896,7 @@ function createMemoryCopyCommand(): Command {
);
});
} catch (error) {
handleError(error, fmt);
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand Down Expand Up @@ -1086,7 +1086,7 @@ function createMemoryExportCommand(): Command {
}
}
} catch (error) {
handleError(error, fmt);
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/commands/pack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ function createPackInstallCommand(): Command {
}
});
} catch (error) {
handleError(error, fmt);
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand Down Expand Up @@ -419,7 +419,7 @@ function createPackListCommand(): Command {
);
});
} catch (error) {
handleError(error, fmt);
handleError(error, fmt, { creds, scope: "space" });
}
});
}
Expand Down
Loading