@inkeep/agents-cli 0.61.0 → 0.62.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/dist/agents-cli/package.js +1 -1
- package/dist/commands/pull-v4/merge-ui/help-bar.js +1 -1
- package/dist/commands/pull-v4/merge-ui/help-bar.js.map +1 -1
- package/dist/commands/pull-v4/merge-ui/resolution-summary.js +1 -1
- package/dist/commands/pull-v4/merge-ui/resolution-summary.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"help-bar.js","names":[],"sources":["../../../../src/commands/pull-v4/merge-ui/help-bar.tsx"],"sourcesContent":["import { Box, Text } from 'ink';\n\ninterface HelpBarProps {\n phase: 'resolving' | 'summary';\n}\n\nfunction Key({ label, action }: { label: string; action: string }) {\n return (\n <Box marginRight={2}>\n <Text bold color=\"yellow\">\n {label}\n </Text>\n <Text dimColor> {action}</Text>\n </Box>\n );\n}\n\nexport function HelpBar({ phase }: HelpBarProps) {\n if (phase === 'summary') {\n return (\n <Box\n borderStyle=\"single\"\n borderTop\n borderBottom={false}\n borderLeft={false}\n borderRight={false}\n paddingX={1}\n >\n <Key label=\"Enter\" action=\"confirm\" />\n <Key label=\"
|
|
1
|
+
{"version":3,"file":"help-bar.js","names":[],"sources":["../../../../src/commands/pull-v4/merge-ui/help-bar.tsx"],"sourcesContent":["import { Box, Text } from 'ink';\n\ninterface HelpBarProps {\n phase: 'resolving' | 'summary';\n}\n\nfunction Key({ label, action }: { label: string; action: string }) {\n return (\n <Box marginRight={2}>\n <Text bold color=\"yellow\">\n {label}\n </Text>\n <Text dimColor> {action}</Text>\n </Box>\n );\n}\n\nexport function HelpBar({ phase }: HelpBarProps) {\n if (phase === 'summary') {\n return (\n <Box\n borderStyle=\"single\"\n borderTop\n borderBottom={false}\n borderLeft={false}\n borderRight={false}\n paddingX={1}\n >\n <Key label=\"Enter\" action=\"confirm\" />\n <Key label=\"p\" action=\"back\" />\n <Key label=\"Esc/q\" action=\"cancel\" />\n </Box>\n );\n }\n\n return (\n <Box\n borderStyle=\"single\"\n borderTop\n borderBottom={false}\n borderLeft={false}\n borderRight={false}\n paddingX={1}\n >\n <Key label=\"↑↓/jk\" action=\"navigate\" />\n <Key label=\"←/1\" action=\"ours\" />\n <Key label=\"→/2\" action=\"theirs\" />\n <Key label=\"Enter/n\" action=\"next\" />\n <Key label=\"p\" action=\"prev\" />\n <Key label=\"Esc/q\" action=\"cancel\" />\n </Box>\n );\n}\n"],"mappings":";;;;AAMA,SAAS,IAAI,EAAE,OAAO,UAA6C;AACjE,QACE,qBAAC;EAAI,aAAa;aAChB,oBAAC;GAAK;GAAK,OAAM;aACd;IACI,EACP,qBAAC;GAAK;cAAS,KAAE;IAAc;GAC3B;;AAIV,SAAgB,QAAQ,EAAE,SAAuB;AAC/C,KAAI,UAAU,UACZ,QACE,qBAAC;EACC,aAAY;EACZ;EACA,cAAc;EACd,YAAY;EACZ,aAAa;EACb,UAAU;;GAEV,oBAAC;IAAI,OAAM;IAAQ,QAAO;KAAY;GACtC,oBAAC;IAAI,OAAM;IAAI,QAAO;KAAS;GAC/B,oBAAC;IAAI,OAAM;IAAQ,QAAO;KAAW;;GACjC;AAIV,QACE,qBAAC;EACC,aAAY;EACZ;EACA,cAAc;EACd,YAAY;EACZ,aAAa;EACb,UAAU;;GAEV,oBAAC;IAAI,OAAM;IAAQ,QAAO;KAAa;GACvC,oBAAC;IAAI,OAAM;IAAM,QAAO;KAAS;GACjC,oBAAC;IAAI,OAAM;IAAM,QAAO;KAAW;GACnC,oBAAC;IAAI,OAAM;IAAU,QAAO;KAAS;GACrC,oBAAC;IAAI,OAAM;IAAI,QAAO;KAAS;GAC/B,oBAAC;IAAI,OAAM;IAAQ,QAAO;KAAW;;GACjC"}
|
|
@@ -86,7 +86,7 @@ function ResolutionSummary({ conflicts, resolutions, allChangedColumns }) {
|
|
|
86
86
|
/* @__PURE__ */ jsx(Text, {
|
|
87
87
|
bold: true,
|
|
88
88
|
color: "yellow",
|
|
89
|
-
children: "
|
|
89
|
+
children: "p"
|
|
90
90
|
}),
|
|
91
91
|
/* @__PURE__ */ jsx(Text, { children: " to go back, " }),
|
|
92
92
|
/* @__PURE__ */ jsx(Text, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolution-summary.js","names":[],"sources":["../../../../src/commands/pull-v4/merge-ui/resolution-summary.tsx"],"sourcesContent":["import type { ConflictItem } from '@inkeep/agents-core';\nimport { Box, Text } from 'ink';\nimport type { ConflictResolutionState, Side } from './types';\nimport { formatEntityId } from './utils';\n\ninterface ResolutionSummaryProps {\n conflicts: ConflictItem[];\n resolutions: ConflictResolutionState[];\n allChangedColumns: string[][];\n}\n\nexport function ResolutionSummary({\n conflicts,\n resolutions,\n allChangedColumns,\n}: ResolutionSummaryProps) {\n return (\n <Box flexDirection=\"column\">\n <Box borderStyle=\"round\" borderColor=\"cyan\" paddingX={1} flexDirection=\"column\">\n <Text bold color=\"cyan\">\n Resolution Summary\n </Text>\n <Text dimColor>{'─'.repeat(50)}</Text>\n\n {conflicts.map((conflict, i) => {\n const resolution = resolutions[i];\n const changedCols = allChangedColumns[i];\n const entityId = formatEntityId(conflict.primaryKey);\n const hasOverrides = Object.keys(resolution.columnOverrides).length > 0;\n\n return (\n <Box key={`${conflict.table}-${entityId}`} flexDirection=\"column\" marginY={0}>\n <Box>\n <Text color=\"cyan\">{conflict.table}</Text>\n <Text bold> "{entityId}"</Text>\n <Text> → default: </Text>\n <Text color={resolution.rowDefaultPick === 'ours' ? 'blue' : 'magenta'}>\n {resolution.rowDefaultPick === 'ours' ? 'local' : 'remote'}\n </Text>\n </Box>\n {hasOverrides && (\n <Box flexDirection=\"column\" marginLeft={2}>\n {changedCols.map((col) => {\n const pick: Side = resolution.columnOverrides[col] ?? resolution.rowDefaultPick;\n const isOverride = col in resolution.columnOverrides;\n if (!isOverride) return null;\n return (\n <Box key={col}>\n <Text dimColor> ↳ {col}: </Text>\n <Text color={pick === 'ours' ? 'blue' : 'magenta'}>\n {pick === 'ours' ? 'local' : 'remote'}\n </Text>\n </Box>\n );\n })}\n </Box>\n )}\n </Box>\n );\n })}\n\n <Box marginTop={1}>\n <Text dimColor>{'─'.repeat(50)}</Text>\n </Box>\n <Box>\n <Text>Press </Text>\n <Text bold color=\"yellow\">\n Enter\n </Text>\n <Text> to apply, </Text>\n <Text bold color=\"yellow\">\n
|
|
1
|
+
{"version":3,"file":"resolution-summary.js","names":[],"sources":["../../../../src/commands/pull-v4/merge-ui/resolution-summary.tsx"],"sourcesContent":["import type { ConflictItem } from '@inkeep/agents-core';\nimport { Box, Text } from 'ink';\nimport type { ConflictResolutionState, Side } from './types';\nimport { formatEntityId } from './utils';\n\ninterface ResolutionSummaryProps {\n conflicts: ConflictItem[];\n resolutions: ConflictResolutionState[];\n allChangedColumns: string[][];\n}\n\nexport function ResolutionSummary({\n conflicts,\n resolutions,\n allChangedColumns,\n}: ResolutionSummaryProps) {\n return (\n <Box flexDirection=\"column\">\n <Box borderStyle=\"round\" borderColor=\"cyan\" paddingX={1} flexDirection=\"column\">\n <Text bold color=\"cyan\">\n Resolution Summary\n </Text>\n <Text dimColor>{'─'.repeat(50)}</Text>\n\n {conflicts.map((conflict, i) => {\n const resolution = resolutions[i];\n const changedCols = allChangedColumns[i];\n const entityId = formatEntityId(conflict.primaryKey);\n const hasOverrides = Object.keys(resolution.columnOverrides).length > 0;\n\n return (\n <Box key={`${conflict.table}-${entityId}`} flexDirection=\"column\" marginY={0}>\n <Box>\n <Text color=\"cyan\">{conflict.table}</Text>\n <Text bold> "{entityId}"</Text>\n <Text> → default: </Text>\n <Text color={resolution.rowDefaultPick === 'ours' ? 'blue' : 'magenta'}>\n {resolution.rowDefaultPick === 'ours' ? 'local' : 'remote'}\n </Text>\n </Box>\n {hasOverrides && (\n <Box flexDirection=\"column\" marginLeft={2}>\n {changedCols.map((col) => {\n const pick: Side = resolution.columnOverrides[col] ?? resolution.rowDefaultPick;\n const isOverride = col in resolution.columnOverrides;\n if (!isOverride) return null;\n return (\n <Box key={col}>\n <Text dimColor> ↳ {col}: </Text>\n <Text color={pick === 'ours' ? 'blue' : 'magenta'}>\n {pick === 'ours' ? 'local' : 'remote'}\n </Text>\n </Box>\n );\n })}\n </Box>\n )}\n </Box>\n );\n })}\n\n <Box marginTop={1}>\n <Text dimColor>{'─'.repeat(50)}</Text>\n </Box>\n <Box>\n <Text>Press </Text>\n <Text bold color=\"yellow\">\n Enter\n </Text>\n <Text> to apply, </Text>\n <Text bold color=\"yellow\">\n p\n </Text>\n <Text> to go back, </Text>\n <Text bold color=\"yellow\">\n Esc/q\n </Text>\n <Text> to cancel</Text>\n </Box>\n </Box>\n </Box>\n );\n}\n"],"mappings":";;;;;AAWA,SAAgB,kBAAkB,EAChC,WACA,aACA,qBACyB;AACzB,QACE,oBAAC;EAAI,eAAc;YACjB,qBAAC;GAAI,aAAY;GAAQ,aAAY;GAAO,UAAU;GAAG,eAAc;;IACrE,oBAAC;KAAK;KAAK,OAAM;eAAO;MAEjB;IACP,oBAAC;KAAK;eAAU,IAAI,OAAO,GAAG;MAAQ;IAErC,UAAU,KAAK,UAAU,MAAM;KAC9B,MAAM,aAAa,YAAY;KAC/B,MAAM,cAAc,kBAAkB;KACtC,MAAM,WAAW,eAAe,SAAS,WAAW;KACpD,MAAM,eAAe,OAAO,KAAK,WAAW,gBAAgB,CAAC,SAAS;AAEtE,YACE,qBAAC;MAA0C,eAAc;MAAS,SAAS;iBACzE,qBAAC;OACC,oBAAC;QAAK,OAAM;kBAAQ,SAAS;SAAa;OAC1C,qBAAC;QAAK;;SAAK;SAAQ;SAAS;;SAAa;OACzC,oBAAC,kBAAK,iBAAmB;OACzB,oBAAC;QAAK,OAAO,WAAW,mBAAmB,SAAS,SAAS;kBAC1D,WAAW,mBAAmB,SAAS,UAAU;SAC7C;UACH,EACL,gBACC,oBAAC;OAAI,eAAc;OAAS,YAAY;iBACrC,YAAY,KAAK,QAAQ;QACxB,MAAM,OAAa,WAAW,gBAAgB,QAAQ,WAAW;AAEjE,YAAI,EADe,OAAO,WAAW,iBACpB,QAAO;AACxB,eACE,qBAAC,kBACC,qBAAC;SAAK;;UAAS;UAAI;UAAI;;UAAS,EAChC,oBAAC;SAAK,OAAO,SAAS,SAAS,SAAS;mBACrC,SAAS,SAAS,UAAU;UACxB,KAJC,IAKJ;SAER;QACE;QAxBA,GAAG,SAAS,MAAM,GAAG,WA0BzB;MAER;IAEF,oBAAC;KAAI,WAAW;eACd,oBAAC;MAAK;gBAAU,IAAI,OAAO,GAAG;OAAQ;MAClC;IACN,qBAAC;KACC,oBAAC,kBAAK,WAAa;KACnB,oBAAC;MAAK;MAAK,OAAM;gBAAS;OAEnB;KACP,oBAAC,kBAAK,gBAAkB;KACxB,oBAAC;MAAK;MAAK,OAAM;gBAAS;OAEnB;KACP,oBAAC,kBAAK,kBAAoB;KAC1B,oBAAC;MAAK;MAAK,OAAM;gBAAS;OAEnB;KACP,oBAAC,kBAAK,eAAiB;QACnB;;IACF;GACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@inkeep/agents-cli",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.62.0",
|
|
4
4
|
"description": "Inkeep CLI tool",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -39,8 +39,8 @@
|
|
|
39
39
|
"tsx": "^4.20.5",
|
|
40
40
|
"yaml": "^2.7.0",
|
|
41
41
|
"zod": "^4.3.6",
|
|
42
|
-
"@inkeep/agents-core": "^0.
|
|
43
|
-
"@inkeep/agents-sdk": "^0.
|
|
42
|
+
"@inkeep/agents-core": "^0.62.0",
|
|
43
|
+
"@inkeep/agents-sdk": "^0.62.0"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
46
|
"@types/degit": "^2.8.6",
|