Skip to content

The open-source app everyone uses to manage agents at work

Merge public-gh/master into paperclip-company-import-export

Dottab5aeae7e22cf
diff --cc packages/adapters/codex-local/src/server/execute.ts
index 31583ab417,5486301095..2a6595a04e
--- a/packages/adapters/codex-local/src/server/execute.ts
+++ b/packages/adapters/codex-local/src/server/execute.ts
@@@ -150,8 -143,8 +150,8 @@@ export async function ensureCodexSkills
await fs.symlink(entry.source, target);
}
await onLog(
- "stderr",
- `[paperclip] Repaired Codex skill "${entry.key}" into ${skillsHome}\n`,
+ "stdout",
- `[paperclip] Repaired Codex skill "${entry.name}" into ${skillsHome}\n`,
++ `[paperclip] Repaired Codex skill "${entry.runtimeName}" into ${skillsHome}\n`,
);
continue;
}
@@@ -161,8 -154,8 +161,8 @@@
if (result === "skipped") continue;
await onLog(
- "stderr",
- `[paperclip] ${result === "repaired" ? "Repaired" : "Injected"} Codex skill "${entry.key}" into ${skillsHome}\n`,
+ "stdout",
- `[paperclip] ${result === "repaired" ? "Repaired" : "Injected"} Codex skill "${entry.name}" into ${skillsHome}\n`,
++ `[paperclip] ${result === "repaired" ? "Repaired" : "Injected"} Codex skill "${entry.runtimeName}" into ${skillsHome}\n`,
);
} catch (err) {
await onLog(
diff --cc packages/shared/src/index.ts
index a96fe8642a,2b87a55610..5dfdfb3994
--- a/packages/shared/src/index.ts
+++ b/packages/shared/src/index.ts
@@@ -120,30 -120,8 +120,32 @@@ export
export type {
Company,
+ CompanySkillSourceType,
+ CompanySkillTrustLevel,
+ CompanySkillCompatibility,
+ CompanySkillSourceBadge,
+ CompanySkillFileInventoryEntry,
+ CompanySkill,
+ CompanySkillListItem,
+ CompanySkillUsageAgent,
+ CompanySkillDetail,
+ CompanySkillUpdateStatus,
+ CompanySkillImportRequest,
+ CompanySkillImportResult,
+ CompanySkillProjectScanRequest,
+ CompanySkillProjectScanSkipped,
+ CompanySkillProjectScanConflict,
+ CompanySkillProjectScanResult,
+ CompanySkillCreateRequest,
+ CompanySkillFileDetail,
+ CompanySkillFileUpdateRequest,
+ AgentSkillSyncMode,
+ AgentSkillState,
+ AgentSkillEntry,
+ AgentSkillSnapshot,
+ AgentSkillSyncRequest,
+ InstanceExperimentalSettings,
+ InstanceSettings,
Agent,
AgentPermissions,
AgentKeyCreated,
diff --cc packages/shared/src/types/index.ts
index 660618290d,01b20b7428..890f774745
--- a/packages/shared/src/types/index.ts
+++ b/packages/shared/src/types/index.ts
@@@ -1,32 -1,5 +1,33 @@@
export type { Company } from "./company.js";
+ export type { InstanceExperimentalSettings, InstanceSettings } from "./instance.js";
+export type {
+ CompanySkillSourceType,
+ CompanySkillTrustLevel,
+ CompanySkillCompatibility,
+ CompanySkillSourceBadge,
+ CompanySkillFileInventoryEntry,
+ CompanySkill,
+ CompanySkillListItem,
+ CompanySkillUsageAgent,
+ CompanySkillDetail,
+ CompanySkillUpdateStatus,
+ CompanySkillImportRequest,
+ CompanySkillImportResult,
+ CompanySkillProjectScanRequest,
+ CompanySkillProjectScanSkipped,
+ CompanySkillProjectScanConflict,
+ CompanySkillProjectScanResult,
+ CompanySkillCreateRequest,
+ CompanySkillFileDetail,
+ CompanySkillFileUpdateRequest,
+} from "./company-skill.js";
+export type {
+ AgentSkillSyncMode,
+ AgentSkillState,
+ AgentSkillEntry,
+ AgentSkillSnapshot,
+ AgentSkillSyncRequest,
+} from "./adapter-skills.js";
export type {
Agent,
AgentPermissions,
diff --cc server/src/routes/agents.ts
index 11a2a2bc74,db91ad8c07..0fbe9b59b0
--- a/server/src/routes/agents.ts
+++ b/server/src/routes/agents.ts
@@@ -69,7 -63,7 +70,8 @@@ export function agentRoutes(db: Db)
const heartbeat = heartbeatService(db);
const issueApprovalsSvc = issueApprovalService(db);
const secretsSvc = secretService(db);
+ const companySkills = companySkillService(db);
+ const workspaceOperations = workspaceOperationService(db);
const strictSecretsMode = process.env.PAPERCLIP_SECRETS_STRICT_MODE === "true";
function canCreateAgents(agent: { role: string; permissions: Record<string, unknown> | null | undefined }) {
diff --cc server/src/services/heartbeat.ts
index ea9f8ff90b,31905a5fd4..3506ebac7d
--- a/server/src/services/heartbeat.ts
+++ b/server/src/services/heartbeat.ts
@@@ -23,10 -25,9 +25,10 @@@ import type { AdapterExecutionResult, A
import { createLocalAgentJwt } from "../agent-auth-jwt.js";
import { parseObject, asBoolean, asNumber, appendWithCap, MAX_EXCERPT_BYTES } from "../adapters/utils.js";
import { costService } from "./costs.js";
+import { companySkillService } from "./company-skills.js";
import { budgetService, type BudgetEnforcementScope } from "./budgets.js";
import { secretService } from "./secrets.js";
- import { resolveDefaultAgentWorkspaceDir } from "../home-paths.js";
+ import { resolveDefaultAgentWorkspaceDir, resolveManagedProjectWorkspaceDir } from "../home-paths.js";
import { summarizeHeartbeatRunResultJson } from "./heartbeat-run-summary.js";
import {
buildWorkspaceReadyComment,
@@@ -592,10 -687,13 +688,14 @@@ function resolveNextSessionState(input
}
export function heartbeatService(db: Db) {
+ const instanceSettings = instanceSettingsService(db);
+
const runLogStore = getRunLogStore();
const secretsSvc = secretService(db);
+ const companySkills = companySkillService(db);
const issuesSvc = issueService(db);
+ const executionWorkspacesSvc = executionWorkspaceService(db);
+ const workspaceOperationsSvc = workspaceOperationService(db);
const activeRunExecutions = new Set<string>();
const budgetHooks = {
cancelWorkForScope: cancelBudgetScopeWork,
@@@ -1540,22 -1709,24 +1711,29 @@@
agent.companyId,
mergedConfig,
);
+ const runtimeSkillEntries = await companySkills.listRuntimeSkillEntries(agent.companyId);
+ const runtimeConfig = {
+ ...resolvedConfig,
+ paperclipRuntimeSkills: runtimeSkillEntries,
+ };
- const issueRef = issueId
- ? await db
- .select({
- id: issues.id,
- identifier: issues.identifier,
- title: issues.title,
- })
- .from(issues)
- .where(and(eq(issues.id, issueId), eq(issues.companyId, agent.companyId)))
- .then((rows) => rows[0] ?? null)
+ const issueRef = issueContext
+ ? {
+ id: issueContext.id,
+ identifier: issueContext.identifier,
+ title: issueContext.title,
+ projectId: issueContext.projectId,
+ projectWorkspaceId: issueContext.projectWorkspaceId,
+ executionWorkspaceId: issueContext.executionWorkspaceId,
+ executionWorkspacePreference: issueContext.executionWorkspacePreference,
+ }
: null;
+ const existingExecutionWorkspace =
+ issueRef?.executionWorkspaceId ? await executionWorkspacesSvc.getById(issueRef.executionWorkspaceId) : null;
+ const workspaceOperationRecorder = workspaceOperationsSvc.createRecorder({
+ companyId: agent.companyId,
+ heartbeatRunId: run.id,
+ executionWorkspaceId: existingExecutionWorkspace?.id ?? null,
+ });
const executionWorkspace = await realizeExecutionWorkspace({
base: {
baseCwd: resolvedWorkspace.cwd,
@@@ -1565,7 -1736,7 +1743,7 @@@
repoUrl: resolvedWorkspace.repoUrl,
repoRef: resolvedWorkspace.repoRef,
},
-- config: resolvedConfig,
++ config: runtimeConfig,
issue: issueRef,
agent: {
id: agent.id,
diff --cc ui/src/App.tsx
index e07b6d3dbd,ff1daecffd..4fc245924a
--- a/ui/src/App.tsx
+++ b/ui/src/App.tsx
@@@ -22,11 -23,9 +23,12 @@@ import { Costs } from "./pages/Costs"
import { Activity } from "./pages/Activity";
import { Inbox } from "./pages/Inbox";
import { CompanySettings } from "./pages/CompanySettings";
+import { CompanySkills } from "./pages/CompanySkills";
+import { CompanyExport } from "./pages/CompanyExport";
+import { CompanyImport } from "./pages/CompanyImport";
import { DesignGuide } from "./pages/DesignGuide";
import { InstanceSettings } from "./pages/InstanceSettings";
+ import { InstanceExperimentalSettings } from "./pages/InstanceExperimentalSettings";
import { PluginManager } from "./pages/PluginManager";
import { PluginSettings } from "./pages/PluginSettings";
import { PluginPage } from "./pages/PluginPage";
diff --cc ui/src/api/index.ts
index 35e799bc0d,0757ff8d49..2065876685
--- a/ui/src/api/index.ts
+++ b/ui/src/api/index.ts
@@@ -12,5 -12,5 +12,6 @@@ export { costsApi } from "./costs"
export { activityApi } from "./activity";
export { dashboardApi } from "./dashboard";
export { heartbeatsApi } from "./heartbeats";
+ export { instanceSettingsApi } from "./instanceSettings";
export { sidebarBadgesApi } from "./sidebarBadges";
+export { companySkillsApi } from "./companySkills";